| commit | a18bcfa45e9d37650bca158577d02f5059453935 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Mon Nov 03 21:02:00 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 21:02:00 2014 +0000 |
| tree | a4de2a1c0f4e23016767d6d982253f374bd07975 | |
| parent | 80f227c1f75d753396a6efd6fccfc0c76c93bae4 [diff] | |
| parent | 91ce3576337b0541912da7ec4b1efd802568dfce [diff] |
am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313 * commit '91ce3576337b0541912da7ec4b1efd802568dfce':