| commit | 5ef30799de8920baa38f61f27808c68efbce6de3 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Wed Apr 27 13:51:31 2011 -0700 |
| committer | Brian Muramatsu <btmura@google.com> | Wed Apr 27 13:51:31 2011 -0700 |
| tree | 1f88fb0dfc0228226ffa9d4d2743ecc0ea456117 | |
| parent | 71dbe44d5e0a1a12c620c6c81173873d786a4023 [diff] | |
| parent | 79c1d920ad60b1b531b9ef0b3b05775f6176f0b9 [diff] |
Merge remote branch 'goog/gingerbread' into manualmerge Conflicts: tests/tests/accounts/src/android/accounts/cts/AccountManagerTest.java tests/tests/net/src/android/net/cts/ConnectivityManagerTest.java tests/tests/net/src/android/net/cts/NetworkInfoTest.java Change-Id: Ia16b95167e5c023cc977ea9d6bf2323d5c6cbf71