| commit | 1b1146be79ad58a52ca1ef84c4216039e054a024 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:47:58 2014 +0900 |
| committer | Lorenzo Colitti <lorenzo@google.com> | Thu Mar 13 19:47:58 2014 +0900 |
| tree | aa5989bfe2d81abe2f40524b33ab1644af41817c | |
| parent | c641fffcd3a69416fa82933ac16d11e9a687dc26 [diff] | |
| parent | e22ed104cc8fee7f1cae33edeafc59758aa7f446 [diff] |
resolved conflicts for merge of e22ed104 to klp-modular-dev-plus-aosp Change-Id: I6d77583042b4707e4e9dda7c4641019c5c5a7248