| commit | 4f8d54cf92ee7a480606b25b62e2b38bd10d99fd | [log] [tgz] |
|---|---|---|
| author | Jie Dai <jied@google.com> | Wed Aug 20 20:48:40 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 20 20:48:40 2014 +0000 |
| tree | 191c1bb731c33d7d8073e7c191ae9ceac1d251b2 | |
| parent | 9d16f8a58db782425046baa72833c9962353d206 [diff] | |
| parent | 1e6f98066a8690459fccf061f681540925285180 [diff] |
am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp * commit '0ce2c26133762a55c52c0262bbe393370b806276':