| commit | 43c15339886bf6c6fb87527d86525da58542e790 | [log] [tgz] |
|---|---|---|
| author | Wink Saville <wink@google.com> | Fri Aug 19 09:28:34 2011 -0700 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 19 09:28:34 2011 -0700 |
| tree | a17cabb0d4508c3ffb541a7b8ba4705222b2f26b | |
| parent | cfdfad3fcadc8bba30f00dbe2f2e835d61cde9ef [diff] | |
| parent | cd34366886d7db3dbb1661bcbdaf9fa6eea20005 [diff] |
Merge "DO NOT MERGE: resolved conflicts for merge of 15e199c8 to honeycomb-plus-aosp" into honeycomb-plus-aosp