| commit | e442282ac089185995a2c394a7faf94a0e2f1063 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Sep 03 21:58:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 03 21:58:16 2015 +0000 |
| tree | 05314c65f37ff04bf7e55127cd8b06df7cf81c57 | |
| parent | 1cad200a96817b5142f6244224b2099e7990d095 [diff] | |
| parent | 2cd838d62e8a73f5f65ec357f30def2f3e7ec3bb [diff] |
am 2cd838d6: am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 * commit '2cd838d62e8a73f5f65ec357f30def2f3e7ec3bb':