| commit | f593264a9ff2aeefaa4c62faeb9bb06499481e7e | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Mon Jul 14 20:40:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 14 20:40:50 2014 +0000 |
| tree | 3dc5aaa74f1272c357d339c3c61d7e1ed0aececf | |
| parent | dab9979de9a7c435824bc741d541832221e7397f [diff] | |
| parent | 31c07b12f94a0e4813366abda5b2d28895674560 [diff] |
am 31c07b12: am 05eb2b37: am bd6b5dd3: Merge "Revert "Fix mac build"" * commit '31c07b12f94a0e4813366abda5b2d28895674560':