| commit | 2cabb7ddb68e5a8198d6c72c81107d2416c4aa64 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Fri Mar 13 07:07:54 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 13 07:07:54 2015 +0000 |
| tree | f0138835e5ddd3595c732e09dd8145bd19eb1e1e | |
| parent | db64454b3354e26c96fdb83a4443cce12e352640 [diff] | |
| parent | 4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b [diff] |
am 4a61eaf7: am 1c24b3f1: Merge "Fix build, broken by https://android-review.googlesource.com/#/c/115890/" * commit '4a61eaf784fb085e66a21e9e4d4fa8aeb6b41c2b': Fix build, broken by https://android-review.googlesource.com/#/c/115890/