commit | 786e40a32eed699662332e197f3d7953d3e60b03 | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:37:48 2014 +0900 |
committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:37:48 2014 +0900 |
tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
parent | 35c9ff942a2a8b85ac5d2ff97c7d4ff30234dd80 [diff] | |
parent | 253009acdf7908fd3b9a62b08327fd593c93953f [diff] |
resolved conflicts for merge of 253009ac to klp-modular-dev-plus-aosp Change-Id: I0d56e3d9e899c542ef0ed8d1c2e12004e24d7044