| commit | 8128f7facef4648320b7ea4f93f27014ea153ac9 | [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 | 8dc8d433bb4f9062a6099e79bd87532a0fa446bb | |
| parent | 68cb323d1bbfc26fab0fb77d8de289a9cc02efd6 [diff] | |
| parent | 4a88b709cc18156f25055de26025857bef9f5e2f [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