| commit | 05eb2b372a910bf684b71c5e8da254e22706d420 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Sat Jul 12 01:42:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jul 12 01:42:14 2014 +0000 |
| tree | 5952a9ea0463cd47a69fad5e08fd94d7e05f4677 | |
| parent | 7be0369aad794bce916ed0737814c9a2587f1eb7 [diff] | |
| parent | bd6b5dd3ce0f4d5454334d4848a97b00120b235e [diff] |
am bd6b5dd3: Merge "Revert "Fix mac build"" * commit 'bd6b5dd3ce0f4d5454334d4848a97b00120b235e': Revert "Fix mac build"