| commit | 9206aeb19f58b9633e73e18a17412be5c0038fff | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Nov 04 01:17:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 01:17:51 2014 +0000 |
| tree | c0cdfb4a702705d8189282fd1f2ae1a6318037fa | |
| parent | ed27b812253bb904ebb995f29e79ff0efdd30cb1 [diff] | |
| parent | 2f30ba2e5745ef1a4268c45c13709c0a27fab5b2 [diff] |
am 2f30ba2e: am a18bcfa4: am 91ce3576: resolve merge conflicts of 290efd2 to klp-modular-dev-plus-aosp. automerge: e916313 automerge: a228c63 * commit '2f30ba2e5745ef1a4268c45c13709c0a27fab5b2':