| commit | 57e6772a2c8f555d362ab1374ccadf99455461cd | [log] [tgz] |
|---|---|---|
| author | Sebastien Hertz <shertz@google.com> | Thu May 15 10:34:36 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu May 15 10:34:36 2014 +0000 |
| tree | 95a2b9dda8538e7e80a6474123faf1cfb9c303ba | |
| parent | e7b7a008769e4daf3ef31ea5cdbf58568111a9aa [diff] | |
| parent | 35674d553e7e05b3a39305e5ea89e4f5cbcb561d [diff] |
am 35674d55: am ba1cf7b3: am 4c6491ff: Merge "Fix build" * commit '35674d553e7e05b3a39305e5ea89e4f5cbcb561d': Fix build