| commit | c641fffcd3a69416fa82933ac16d11e9a687dc26 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:44:47 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:44:47 2014 +0900 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | 786e40a32eed699662332e197f3d7953d3e60b03 [diff] | |
| parent | e50d57677775e32832d59bfa09c3f13291b47686 [diff] |
resolved conflicts for merge of e50d5767 to klp-modular-dev-plus-aosp Change-Id: Id1c0debfcbbfd76641368b481afc8b96cd822705