| commit | b38ef83f969221c2cbb891e609bb80f7a53a034d | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Thu Aug 21 17:38:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 21 17:38:58 2014 +0000 |
| tree | da27673a2cd4d5f46afe1a3506325e85fdaeb757 | |
| parent | 8add9962a5c88ff307d573be91bb091a2b14568d [diff] | |
| parent | 1f8913765270e9d90ad7384156629e116236355d [diff] |
am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp * commit '1f8913765270e9d90ad7384156629e116236355d':