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