| commit | 2b3bae61e4b9b360512ab649b25043ee8e990bcc | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 01:40:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:40:03 2015 +0000 |
| tree | 6c5f70177dbf16b27bad3b22f9b46a6a0f675724 | |
| parent | c538a53127f69f45141664013bbe0bda6d259e3a [diff] | |
| parent | 3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0 [diff] |
am 3c376c6f: am 3e15e6d7: am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '3c376c6fac2497640e68c75fd4a0e1fa0d79c3b0': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"