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