| commit | 1e6f98066a8690459fccf061f681540925285180 | [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 | 191c1bb731c33d7d8073e7c191ae9ceac1d251b2 | |
| parent | 89197d0fdc284853b8dc4966093bfca743fb6954 [diff] | |
| parent | 9f4dda6d1145152d7641123b5e7c4be310173ef5 [diff] |
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit 'c7a7b2acc57bea137e4f8066802d4b9264ea3275':