| commit | a0eb50accabe83b18bd3fe3b9d6417a4718af9e2 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Feb 13 16:32:48 2014 -0800 |
| committer | Colin Cross <ccross@android.com> | Thu Feb 13 16:32:48 2014 -0800 |
| tree | fd015efd5a80c52389592b5fed88c2a9a75ffbea | |
| parent | 9b2077d4b969e9f8598242915f094552c5d78ad5 [diff] | |
| parent | 2fbe5018f94f536541c0137be472e58c79890813 [diff] |
resolved conflicts for merge of 2fbe5018 to klp-modular-dev-plus-aosp Change-Id: I623332e427ce8bfcf1b17e708ccca1d50cdbeadd