| commit | e13b7b4c79c2a5db5554298035304a3c637dd590 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Fri Aug 30 16:33:34 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Fri Aug 30 16:33:34 2013 -0700 |
| tree | aa2addd2ae25a657067c8f18a46146536549bfd7 | |
| parent | 3e3962c7bc21f3b16270e43dd05c46e298da208c [diff] | |
| parent | e89c4900bd70432d34a540838c72c4bd1a54654c [diff] |
resolved conflicts for merge of e89c4900 to klp-dev-plus-aosp Change-Id: I78bbec3aed3abb5ee4d77aea7444d44484ce729f