| commit | 0ce2c26133762a55c52c0262bbe393370b806276 | [log] [tgz] |
|---|---|---|
| author | Jie Dai <jied@google.com> | Wed May 07 20:55:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 07 20:55:47 2014 +0000 |
| tree | 6931963b83b155148dd0bacd7d806665a62b36d8 | |
| parent | 0c063c66604c5dee434534ff775eb6d18ce4ed7b [diff] | |
| parent | c7a7b2acc57bea137e4f8066802d4b9264ea3275 [diff] |
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':