| commit | 30439d62d28d1368b68c59e77fb1bcf6be1d8fbe | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Apr 09 23:50:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 09 23:50:47 2014 +0000 |
| tree | c3049f146395f1d8f440139439f4945c9dcfd920 | |
| parent | 2835db8b62ec8cb15369a96da6d7b97122d395fb [diff] | |
| parent | 6fdb5e6df178b3b1062ac67b505b288aa609a66b [diff] |
am 6fdb5e6d: resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp * commit '6fdb5e6df178b3b1062ac67b505b288aa609a66b':