| commit | 76c674451c831c1e9c3e3ee134ea8af26ae19ac1 | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Wed Apr 03 21:05:34 2013 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 03 21:05:34 2013 +0000 |
| tree | ed7eefec7f3613c2f2f408012deb545ed0d0142a | |
| parent | 977e1f263cee9023baf12cb430b5547e415e763e [diff] | |
| parent | d3f0e0ae379f4420b01bb9de932a764c035ff2a6 [diff] |
Merge "resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp" into jb-mr2-dev-plus-aosp