| commit | 6e2dd5874a9ee2eccb339187a936ef38dfa8634b | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Tue Aug 18 16:51:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 16:51:13 2015 +0000 |
| tree | 194ff756bebca257cc5b685e37940744c3d5e8c7 | |
| parent | 06a1b202613b861ae43d39510cdd47d0d1c84893 [diff] | |
| parent | 8b0660e0b4335d1a594602715da92e7b52c66260 [diff] |
am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '8b0660e0b4335d1a594602715da92e7b52c66260': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"