| commit | 908fae826b0f1dbc29437c78a5437cd94e414fdc | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Apr 09 23:56:44 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 09 23:56:44 2014 +0000 |
| tree | 1dec5d0b814e6733347d9eb1f1ba542e11cbaaa5 | |
| parent | 51b6daf6b0d3c090cf65e431dd5fee223a30d275 [diff] | |
| parent | 30439d62d28d1368b68c59e77fb1bcf6be1d8fbe [diff] |
am 30439d62: am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp * commit '30439d62d28d1368b68c59e77fb1bcf6be1d8fbe':