| commit | 31c07b12f94a0e4813366abda5b2d28895674560 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Sat Jul 12 02:06:13 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 02:06:13 2014 +0000 |
| tree | ac2892c108fcf7603b69c550283b2d3c67b45e36 | |
| parent | 175b716b04ea252694c08a1fdad31ae36e4d73c1 [diff] | |
| parent | 05eb2b372a910bf684b71c5e8da254e22706d420 [diff] |
am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build"" * commit '05eb2b372a910bf684b71c5e8da254e22706d420': Revert "Fix mac build"