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