| commit | cb72d4ef9a2f5f9f69297434d68ebe96550730d4 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Mar 20 23:15:06 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 20 23:15:06 2015 +0000 |
| tree | 298bf379e2d05489ab6d5907221d22778bb1e885 | |
| parent | 2cfa663f10b8efaed85b5f83b48211da0228aa31 [diff] | |
| parent | 62a0f9d481ce6c5525dd93007afbdf092e011237 [diff] |
am 62a0f9d4: am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '62a0f9d481ce6c5525dd93007afbdf092e011237':