| commit | 5bffb360f095cb6db5ae539d1571ec1be9e8fd35 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Sep 12 12:00:55 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu Sep 12 12:00:55 2013 -0700 |
| tree | a6d215f2dddd7806cbf1022f29b353c765e2bcbc | |
| parent | d6d4cfedf03e78a4dc90ec29f19b6bc08a1846f3 [diff] | |
| parent | ecbc22ead1eb97014342b8f014130a018935bee4 [diff] |
resolved conflicts for merge of ecbc22ea to klp-dev-plus-aosp Change-Id: I72314a9fca71529816245c137b6ab2f8edaf94b8