| commit | 6fdb5e6df178b3b1062ac67b505b288aa609a66b | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Wed Apr 09 16:47:40 2014 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Wed Apr 09 16:47:40 2014 -0700 |
| tree | ee0deb7f1f9bd87e35cf6a8a7bb1d638de1c145e | |
| parent | 280fe930a432d9e2ead8c4b58ce76a0ee45742e7 [diff] | |
| parent | 7289f3ab8f05db6206d696d75f460fadc05dc731 [diff] |
resolved conflicts for merge of 7289f3ab to klp-modular-dev-plus-aosp Change-Id: I5bdc8862828b56557410a95e7f9b14def81a0ded