| commit | 416132888bbd1d6c514f88b6f97eed6bd6b3213f | [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 | 2e318f83df07f569446359228074dd18e56a17df | |
| parent | 85df20657a1ef361fe54d588f6c857d89930bc6a [diff] | |
| parent | e37f468ed4943ca4f3c1087114d2089235afd636 [diff] |
Merge "resolved conflicts for merge of 16cbe575 to honeycomb-mr1" into honeycomb-mr1