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