| commit | 2cd838d62e8a73f5f65ec357f30def2f3e7ec3bb | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Sat Nov 15 05:14:16 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Nov 15 05:14:16 2014 +0000 |
| tree | 04f941c3442b4e6d601f8a2b5f8473dd5227ed82 | |
| parent | 5fbb1d0b7e6e04efb7a0c33d82f9a5088b93741f [diff] | |
| parent | 47a20d81e890012821e0cc3bf31bbb6a6d17400e [diff] |
am 47a20d81: resolve merge conflicts of 6c1149d to klp-modular-dev-plus-aosp. automerge: f6f6d69 * commit '47a20d81e890012821e0cc3bf31bbb6a6d17400e':