| commit | cf994cc57df33121cea7a0082c8ea55ca125279c | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Thu Mar 10 15:29:12 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Mar 10 15:29:12 2011 -0800 |
| tree | a2ca2d19bf0a68c851e55244c22d019f5112f56b | |
| parent | a7118e33b494b26bfbd37c895a1c412cd5da56ec [diff] | |
| parent | 4bc5c4a1f5ea529ef7c7b38ee3782c8f209f7b9c [diff] |
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1