| commit | ecac2199f6f86781cbebecf3656cfea8053655d2 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Wed Sep 18 16:02:49 2013 -0700 |
| committer | Robert Greenwalt <rgreenwalt@google.com> | Wed Sep 18 16:02:49 2013 -0700 |
| tree | f2bc1dce9cfa1890f753c5f57c9135b8ce783e51 | |
| parent | cefc0e2ac1edb5617bdb571c92b4c82394e64c31 [diff] | |
| parent | 619d3c1e35687f9ec6e5f4a1f291c5422980c08b [diff] |
resolved conflicts for merge of 619d3c1e to klp-dev-plus-aosp Change-Id: I216a1f830367d7280fd88bd8fdaef77b595ae6c2