| commit | 4f8e50d8e51dcf72895803c044b14e370e644303 | [log] [tgz] |
|---|---|---|
| author | Tim Murray <timmurray@google.com> | Fri Jul 25 01:03:35 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 25 01:03:35 2014 +0000 |
| tree | 266d7bccf6168ac2303630ec36795f50ede7f6c8 | |
| parent | 71ecd1dd0fb4a102ea431e9ff9f4d9f82eef4920 [diff] | |
| parent | d161be2d063565ecab6d1fce4440d496d8928abc [diff] |
am d161be2d: am 77d93bce: Merge "fix build" * commit 'd161be2d063565ecab6d1fce4440d496d8928abc': fix build