| commit | 46a091f5f15b8a5bfae678e324a98443f6c8340f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Oct 07 15:04:47 2013 -0700 |
| committer | Elliott Hughes <enh@google.com> | Mon Oct 07 15:04:47 2013 -0700 |
| tree | 4dc6bb91e3adc604be6b0d14f662a7336d78c6d7 | |
| parent | 5be92401e991779d99ab74f1577359db6a48d54d [diff] | |
| parent | 21f59276058a897108bdaa72d3c4089259b3292f [diff] |
resolved conflicts for merge of 21f59276 to klp-dev-plus-aosp Change-Id: Idab174c61b0e3122124aece6b7bf2179aea1536d