| commit | f913c2dd7729f7907a723256838672eccf565050 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Sep 12 09:40:58 2013 -0700 |
| committer | Kenny Root <kroot@google.com> | Thu Sep 12 09:40:58 2013 -0700 |
| tree | c239f02c14483b1626a13fd1dd08337c5772bcbe | |
| parent | ef8921a9bcfc47cae3402b5ca24083a21458b5ad [diff] | |
| parent | b4ada1cc9483771e3b3cf7590900ff1e80c931c3 [diff] |
resolved conflicts for merge of b4ada1cc to klp-dev-plus-aosp Change-Id: Id312795c1401e00c81c9b8d0712222f2933d8fcd