| commit | 3fafc674364284016cd03d68f6633cd18691b76a | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Aug 03 11:15:58 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Aug 03 11:15:58 2011 -0700 |
| tree | ea5e8cd5613d61878747bb95028a2fc8868f6631 | |
| parent | 20abc2a305e95aab12e18e247706d843e9aebace [diff] | |
| parent | 446004f35dc426ef8a8a470548a47e3817cecb22 [diff] |
Merge remote branch 'goog/honeycomb-mr1' into manualmerge Conflicts: apps/CtsVerifier/AndroidManifest.xml Change-Id: Idae96c502113b2bcd1e4a63c702f9b7f105133f5