| commit | cda6b3d88137de4bd087a213b22a803b42ef2311 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@android.com> | Thu Jan 20 14:58:27 2011 -0800 |
| committer | Brian Muramatsu <btmura@android.com> | Thu Jan 20 15:03:31 2011 -0800 |
| tree | 91261cef3ff4bffe7849b740cf7b73443ce782cb | |
| parent | 9b7ea4afaccd2d1e14db16495e43cf34aac7a120 [diff] | |
| parent | c02749936febd2f155230c053343c2689626884c [diff] |
Merge remote branch 'korg/froyo' into manualmerge Conflicts: tests/tests/permission/src/android/permission/cts/NoActivityRelatedPermissionTest.java tests/tests/telephony/src/android/telephony/cts/SmsManagerTest.java Change-Id: Ie74c678a6ae142d9861b6965a8ca89ff58ebfa83