| commit | 668344dd326be0e6f91fa2852f7e18fed3267653 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Tue Sep 13 16:10:14 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Tue Sep 13 16:10:14 2011 -0700 |
| tree | f805ced2e4e77782b294d62776c5fb92dd313dce | |
| parent | e08370d982cfc62f5d12fecec427e784a6a8e15b [diff] | |
| parent | 1eacc524d600f8740b421fdaa3bae2c538a8eb0c [diff] |
Merge remote branch 'goog/honeycomb-mr1' into honeycomb-mr2 Conflicts: tests/tests/dpi/src/android/dpi/cts/ConfigurationTest.java Change-Id: I7c1af2c95488db0e14e2973b6d0dc6ad33059dfe