| commit | 98bcc322cb3a04e0f2c3bb49d08ff3060edc89a6 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Nov 17 17:21:23 2011 -0800 |
| committer | Brian Muramatsu <btmura@google.com> | Thu Nov 17 17:21:23 2011 -0800 |
| tree | feb344594131ca010e73d53ecdea5d1db0e0b2b5 | |
| parent | 430a5eac0901ddeb7734851a8f3dc1e1382e7d6b [diff] | |
| parent | 3f0edcf1cbb9dce4d19cc7219f5421dcc2d7aaf4 [diff] |
Merge remote branch 'goog/honeycomb-mr2' into ics-mr0 Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/expectations/knownfailures.txt Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f