| commit | 2c32144b328e0191fa32bf342dc7eb01d6174b6e | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Wed Feb 12 13:06:30 2014 -0800 |
| committer | Colin Cross <ccross@android.com> | Wed Feb 12 13:09:29 2014 -0800 |
| tree | c59140890b7157f571306c2169ad53c2e62a9932 | |
| parent | 0b7197a612459caf2cdac8b9f0c0b8c5365b7837 [diff] | |
| parent | 7cd7bd65fd2e81b8c05787fd7f0b8c91b6033239 [diff] |
resolved conflicts for merge of 7cd7bd65 to klp-modular-dev-plus-aosp Change-Id: Ib4f062a59d442b29b9782fd8c0328fd551c3a32a