| commit | 3c803e7f777ad745b1b2cae0bdb2a31b11d47e80 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Tue Aug 18 16:40:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 18 16:40:46 2015 +0000 |
| tree | 8be9f492ebfb6f4b14662f00ce308ed22ceaaaa1 | |
| parent | 93bc61764eb8417165de2bbaa6384165f7298a32 [diff] | |
| parent | 6afd8574d44ae158bed9cafe1c74dd1bfc5573b6 [diff] |
am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '6afd8574d44ae158bed9cafe1c74dd1bfc5573b6': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"