| commit | 6668799e7bb3332c8cc8f24c67fe16cb37ca7900 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Thu Mar 13 17:35:26 2014 -0700 |
| committer | Dianne Hackborn <hackbod@google.com> | Thu Mar 13 17:35:26 2014 -0700 |
| tree | b4788b2eac020dc6eb70b73f44aa1647ea5d0753 | |
| parent | 2fceaccc30c8212634bd43aa59a8000bccae8496 [diff] | |
| parent | 264d4001e7d01e302f93803d161f778fb200e346 [diff] |
resolved conflicts for merge of 264d4001 to klp-dev-plus-aosp Change-Id: Ib95e5f6a6a5a613395a13a9df3d283348576d241