| commit | 3e16013fe2e0065c8e9d924de64227ba3047d562 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 20:35:21 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 20:35:21 2015 +0000 |
| tree | 640eae42d9e4191b425679a0147c304724bc148f | |
| parent | e6f272cab03075e8c5cc66f42e028375c0604406 [diff] | |
| parent | 54e849d694561c4caeecbb2ff0526638355c4be2 [diff] |
am 54e849d6: am f4332740: (-s ours) am 81d1f324: am 123c013b: am 7bc20ac5: am cc3411e3: am 0bf31aeb: am 9359e822: am 8a34499a: am c23e3dd8: Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4 * commit '54e849d694561c4caeecbb2ff0526638355c4be2':