| commit | 00d115a7533df23027f671c90c0ae52684392e4a | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Thu Mar 13 16:31:14 2014 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Thu Mar 13 16:35:09 2014 -0700 |
| tree | 8c7cda713abb0e5c2c9f4a39cd3323c3bef7b313 | |
| parent | 107041e299a48f9624bf7a70c003effac1c363ce [diff] | |
| parent | aa737c49df79749fe92b89d745eba7442762e2b5 [diff] |
resolved conflicts for merge of aa737c49 to klp-modular-dev-plus-aosp Change-Id: I1f4e555773fe6138efaf73444525da0f747b01d5