| commit | 97b6a96d8ca7313413752e6369210a233dfe994d | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 12:20:53 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 12:20:53 2014 +0900 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | 62bb354dcdbe9fc93344a2727dc89720e420db81 [diff] | |
| parent | ab8f4f89dd9a7805f57aff3884b7de1c34694634 [diff] |
resolved conflicts for merge of ab8f4f89 to klp-modular-dev-plus-aosp Change-Id: Ia07d5557d52452d27d6c1f1efbfaee3fc48e1fb1