| commit | 54e849d694561c4caeecbb2ff0526638355c4be2 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 27 05:22:56 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 05:22:56 2015 +0000 |
| tree | 0c95cfa6c7fd28b15ac08f4d70497562fc384835 | |
| parent | 801d2d69a20cb9fc9cfbcebe382c0381926dc3fe [diff] | |
| parent | f4332740f3842a9c8a28c3ca7cac8e92b62b8dd0 [diff] |
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 'f4332740f3842a9c8a28c3ca7cac8e92b62b8dd0':