| commit | 3e15e6d738d02efb4108251cdc75240569916b69 | [log] [tgz] |
|---|---|---|
| author | Abhishek Arya <aarya@google.com> | Thu Aug 20 01:16:14 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 20 01:16:14 2015 +0000 |
| tree | 9d3d21842e1402b5a8ca1749ac42db7c1ab0f71e | |
| parent | 39f239932e94cb47a984ce50393beba5d5a8564a [diff] | |
| parent | 6e2dd5874a9ee2eccb339187a936ef38dfa8634b [diff] |
am 6e2dd587: am 8b0660e0: am 3c803e7f: am 6afd8574: am 073a656d: am deba0610: Merge "Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"" into klp-dev * commit '6e2dd5874a9ee2eccb339187a936ef38dfa8634b': Revert "Fix compile after rI431aa2b7d30a942350ab6d105451c6b77e2f99d4"