| commit | 7b1524d4e866b53ab0d02a59cc6ccb133bd98f77 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Fri Mar 21 17:36:41 2014 -0700 |
| committer | Colin Cross <ccross@android.com> | Fri Mar 21 17:36:41 2014 -0700 |
| tree | 1a57a0a0e0f957a81cf71512d23dbe70ba06ca94 | |
| parent | 0fcba89e5460ed3edca75322175b8a56a6e6f48d [diff] | |
| parent | 3d7c500234d98464d37ba3e1b65cea763b316b69 [diff] |
resolved conflicts for merge of 3d7c5002 to klp-dev-plus-aosp Change-Id: I19e1a26bd0226119c4fe2920bf6a09aaeff315d9