| commit | 35c9ff942a2a8b85ac5d2ff97c7d4ff30234dd80 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:24:01 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:25:04 2014 +0900 |
| tree | a0d067456309956aa7bdfb4a66dd0e36ae7e55de | |
| parent | 0b55c77e96ec1804f5b4eb0fde4bb22d79a55cad [diff] | |
| parent | c87d5c752b34b95be53467a43f228c6081809843 [diff] |
resolved conflicts for merge of c87d5c75 to klp-modular-dev-plus-aosp Change-Id: I6b3ad7d2bf6859b5e4505aa6fae2e909a8767019