| commit | 309f8b3fb5db447d15af97a4a190106ff37fbc1a | [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 | bb161b1bfcdbc24fbb80364ebaadfbbc64892d07 | |
| parent | 3dc050e0eb93003721cfedca704f89908d07a24a [diff] | |
| parent | f021575916751be629f9d6f320daf6a39186e2b7 [diff] |
Merge remote branch 'goog/honeycomb-mr2' into ics-mr0 Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/expectations/knownfailures.txt Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f