| commit | 4141ef9430a5d7730c6207d76bdc9a0e2a109770 | [log] [tgz] |
|---|---|---|
| author | Brian Muramatsu <btmura@google.com> | Thu Nov 17 14:20:50 2011 -0800 |
| committer | Brian Muramatsu <btmura@google.com> | Thu Nov 17 14:20:50 2011 -0800 |
| tree | 03c14c321a68ddc04685e68c0a53045747a33085 | |
| parent | 6eb7128c9cadab4f823fc21f917b4bf81efe3b6e [diff] | |
| parent | 531debc2802064e0e242fc873a711787d6dcd762 [diff] |
Merge remote branch 'goog/gingerbread' into honeycomb Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/tests/telephony/src/android/telephony/cts/SmsMessageTest.java tools/host/src/com/android/cts/Version.java Change-Id: Ie15a3eb7f002a300469f17e3f906856c07061223