| commit | 5d25d43cb2e984c7af6757075df4669b2e46da55 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Thu Mar 24 12:09:31 2011 -0700 |
| committer | Brian Muramatsu <btmura@android.com> | Thu Mar 24 12:52:46 2011 -0700 |
| tree | f81507534adb8a3b96401f1ce0bac6a36798128b | |
| parent | 82bc1287714ca38e529e8f184bbe445febd60214 [diff] | |
| parent | 0a739d578424267e24eda88d259449ffcc4fe6d8 [diff] |
Merge remote branch 'korg/froyo' into froyomerge Conflicts: tests/appsecurity-tests/src/com/android/cts/appsecurity/AppSecurityTests.java tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java tests/tests/view/src/android/view/cts/ViewTest.java tools/host/src/com/android/cts/Version.java tools/utils/CollectAllTests.java Change-Id: I32c04ce6a2eba4c1f30fe80afb9bf2adcf269e73