| commit | b56d208215ecb28621423e764469e89e648e9a6d | [log] [tgz] |
|---|---|---|
| author | Joe Fernandez <joefernandez@google.com> | Mon Nov 04 15:19:30 2013 -0800 |
| committer | Joe Fernandez <joefernandez@google.com> | Mon Nov 04 15:19:30 2013 -0800 |
| tree | c1805e3f7c2ea5912ff28466a4469af9bea3fb42 | |
| parent | 65a245cd02803b8c3186abf53058b68b9a1b3b74 [diff] | |
| parent | 43730d47796483652721b354ec5a4d7c6d291710 [diff] |
resolved conflicts for merge of 43730d47 to klp-dev-plus-aosp Change-Id: Ic42a0221a2a3e24b2bdc5eeee49eae24c40ccf25