| commit | 2eb7abce49f2bc4d2d6d74291219f13ba5e2cbf8 | [log] [tgz] |
|---|---|---|
| author | Victoria Lease <violets@google.com> | Sat Sep 07 00:29:22 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Sat Sep 07 00:29:23 2013 +0000 |
| tree | d1cf3829b66cfa2d706899b878a86be021376f17 | |
| parent | 37d4cd4729b4433d997e0bdbc9446c92b6b80b2a [diff] | |
| parent | 29a311638bce16849eff66f622dddb76d9771ff8 [diff] |
Merge "resolved conflicts for merge of 5d34e4d6 to klp-dev-plus-aosp" into klp-dev-plus-aosp