42562 Commits

Author SHA1 Message Date
Jeff Brown
1df27c02ec am 1f26ea13: am 561a434b: Merge "Fix emulator trackball." into honeycomb
* commit '1f26ea1306a018a0d0eac2295a5ca235b9475d86':
  Fix emulator trackball.
2011-01-25 12:38:22 -08:00
Jeff Brown
1f26ea1306 am 561a434b: Merge "Fix emulator trackball." into honeycomb
* commit '561a434b9769217b8936eea40b564bb9615f1a12':
  Fix emulator trackball.
2011-01-25 12:36:26 -08:00
Jeff Brown
561a434b97 Merge "Fix emulator trackball." into honeycomb 2011-01-25 12:33:50 -08:00
Gilles Debunne
ffba6d6302 am 5d1c7609: am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
* commit '5d1c76095e64405a80456d23d4a3fa5dd053a72f':
  Fixed CAB background and selection color for legacy applications.
2011-01-25 11:41:59 -08:00
Gilles Debunne
5d1c76095e am bb37b647: Merge "Fixed CAB background and selection color for legacy applications." into honeycomb
* commit 'bb37b6477fe76a045654290f2b998a61ff2632b9':
  Fixed CAB background and selection color for legacy applications.
2011-01-25 11:39:39 -08:00
Gilles Debunne
3971b8cd52 am 2b5a62af: am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
* commit '2b5a62afdef5efc47e223057de0c867ffafef22d':
  Removed warnings in DynamicLayout
2011-01-25 11:38:33 -08:00
Gilles Debunne
bb37b6477f Merge "Fixed CAB background and selection color for legacy applications." into honeycomb 2011-01-25 11:37:54 -08:00
Gilles Debunne
2b5a62afde am 2a32a39e: Merge "Removed warnings in DynamicLayout" into honeycomb
* commit '2a32a39e9a0455732724bbbbbdce41e12a8ffb1e':
  Removed warnings in DynamicLayout
2011-01-25 11:36:21 -08:00
Gilles Debunne
2a32a39e9a Merge "Removed warnings in DynamicLayout" into honeycomb 2011-01-25 11:34:19 -08:00
Wink Saville
6ec87ea08a am ca7c4a5d: am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
* commit 'ca7c4a5d1c6bc3f312862c0311fa21d0d41ababc':
  Add debug to CallManager#canDial.
2011-01-25 11:08:53 -08:00
Romain Guy
da6e6290a8 am 8699aa3a: am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb
* commit '8699aa3a2f097cbb3eaf9019645da474e87355e3':
  Remove debugging log left by mistake.
2011-01-25 11:06:25 -08:00
Wink Saville
ca7c4a5d1c am 774f9be5: Merge "Add debug to CallManager#canDial." into honeycomb
* commit '774f9be5dc02e8a7f742008872c6214e517cb8a3':
  Add debug to CallManager#canDial.
2011-01-25 11:06:24 -08:00
Romain Guy
8699aa3a2f am 2bd78c9a: Merge "Remove debugging log left by mistake." into honeycomb
* commit '2bd78c9a9b15d1c5c06d838c1fca77d9748e1c41':
  Remove debugging log left by mistake.
2011-01-25 11:03:55 -08:00
Brian Carlstrom
aa16a0f357 am f2b7c844: am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit 'f2b7c84468c5397b44566c393bec2675d73817b7':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:03:52 -08:00
Marco Nelissen
acd65ba837 am 8952df72: am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '8952df72402d8edbc60a0285f0dc7e8fce29a96f':
  Increase the number of useful bits in the spectrum.
2011-01-25 11:03:39 -08:00
Nick Pelly
c1c93d647a am 894983f0: am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '894983f060b8e296335c50165049747d0a33fbc0':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 11:03:35 -08:00
Hung-ying Tyan
a2e91ae115 am b30392d2: am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'b30392d288c6c72a6db00a71a2ca586793161b48':
  Get mute state from active call.
2011-01-25 11:03:31 -08:00
Hung-ying Tyan
fbb47cfdc5 am 2b6d07a5: am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '2b6d07a51a4692cefea11035eacd257eef24f02c':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-25 11:03:26 -08:00
Wink Saville
774f9be5dc Merge "Add debug to CallManager#canDial." into honeycomb 2011-01-25 11:02:25 -08:00
Romain Guy
2bd78c9a9b Merge "Remove debugging log left by mistake." into honeycomb 2011-01-25 11:01:55 -08:00
Romain Guy
8d2959ddff Remove debugging log left by mistake.
Change-Id: I7d5165b4b682714940cea9886abeedd3f4858057
2011-01-25 11:03:00 -08:00
Brian Carlstrom
f2b7c84468 am 8d37c4ef: Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb
* commit '8d37c4efeb853fdc6626f89b5bc0ec79eb451162':
  Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle
2011-01-25 11:00:24 -08:00
Marco Nelissen
8952df7240 am 4b440268: am c929677e: Merge "Increase the number of useful bits in the spectrum." into gingerbread
* commit '4b44026879723d924ddc306ea1e330a9e87c3a1c':
  Increase the number of useful bits in the spectrum.
2011-01-25 10:58:56 -08:00
Nick Pelly
894983f060 am 3b61e47a: am b134223f: Make Mifare Classic increment/decrement operands little endian
* commit '3b61e47a3f173133e5a3cfcbfe6812eb02a0a760':
  Make Mifare Classic increment/decrement operands little endian
2011-01-25 10:58:46 -08:00
Hung-ying Tyan
b30392d288 am df1cc4ef: am cc019c0c: Merge "Get mute state from active call." into gingerbread
* commit 'df1cc4ef9205239701bbe73f903e89a9dfd2623a':
  Get mute state from active call.
2011-01-25 10:58:42 -08:00
Hung-ying Tyan
2b6d07a51a am 8a424af1: am 14b6d062: Merge changes Ib70e0cf2,I0691cd70 into gingerbread
* commit '8a424af1d93a13f3b330ffe39de8aa7c592fdf49':
  SipService: registers broadcast receivers on demand.
  SipService: release wake lock for cancelled tasks.
2011-01-25 10:58:26 -08:00
Brian Carlstrom
8d37c4efeb Merge "Tracking jarjar of org.bouncycastle to com.android.org.bouncycastle" into honeycomb 2011-01-25 10:58:02 -08:00
Jeff Brown
c0eb52e457 am 2996adb7: (-s ours) am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit '2996adb765fe34cf12744019d60b3db86fb31295':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-25 10:56:42 -08:00
Andreas Huber
968c805086 am a79ec961: (-s ours) am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'a79ec961af59ad754cc338a1d3579f9940246b6f':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-25 10:56:38 -08:00
Jeff Brown
2996adb765 am e9acc401: (-s ours) am d8bdc06f: Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
* commit 'e9acc40151db2c5ec3c958c206f7c2e805709e29':
  Fix SENSOR_LANDSCAPE and SENSOR_PORTRAIT (DO NOT MERGE)
2011-01-25 10:53:51 -08:00
Andreas Huber
a79ec961af am ca1cf59f: (-s ours) am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
* commit 'ca1cf59f495dacb132f2a83cefad41d51141a699':
  DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
2011-01-25 10:53:46 -08:00
Brad Fitzpatrick
23b802f65b am 28ae70ce: am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '28ae70ceac7d8295c3ba0dbd644c5cef56dc72b3':
  Avoid using String.format in MediaRecorder
2011-01-25 10:50:59 -08:00
Justin Ho
9fcaeb9139 am e73a710b: am 7cd1cc83: am 28c4f69a: Updated checkbox assets
* commit 'e73a710bea6e3d925c028e90be43618ee5d23826':
  Updated checkbox assets
2011-01-25 10:50:56 -08:00
Brad Fitzpatrick
28ae70ceac am 23a813e1: am 996de2dd: Merge "Avoid using String.format in MediaRecorder"
* commit '23a813e17d94083c24a34559864722c809b4e0f7':
  Avoid using String.format in MediaRecorder
2011-01-25 10:48:05 -08:00
Justin Ho
e73a710bea am 7cd1cc83: am 28c4f69a: Updated checkbox assets
* commit '7cd1cc83194fb25b0bcc9d40b20dcff9a427afe8':
  Updated checkbox assets
2011-01-25 10:47:56 -08:00
Gilles Debunne
9854161e8f am 9eaa9b97: am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
* commit '9eaa9b97d78e3efed1ac497822ca06c03db890cd':
  TextLine cache is used, even for long lines of text.
2011-01-25 10:47:33 -08:00
Gilles Debunne
9eaa9b97d7 am b6b15dca: Merge "TextLine cache is used, even for long lines of text." into honeycomb
* commit 'b6b15dca725b3467ea03fa4c0ae29e6b6e753b27':
  TextLine cache is used, even for long lines of text.
2011-01-25 10:45:15 -08:00
Gilles Debunne
b6b15dca72 Merge "TextLine cache is used, even for long lines of text." into honeycomb 2011-01-25 10:43:05 -08:00
Robert Greenwalt
fc8e55850b am 678c6a35: am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb
* commit '678c6a358dc14beb7825b30346ab09df432ba1fe':
  Fix tethering when switching default connection
2011-01-25 10:34:53 -08:00
Shimeng (Simon) Wang
e59b34cfbf am 1dc6b9eb: am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
* commit '1dc6b9ebc6ea584b8294e920d0153365c6aa2486':
  Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:34:50 -08:00
Arnaud Ferir
eed0f2c22d am 0d128912: am 10ab8617: am 5e81a6e2: Fix trace mismatch.
* commit '0d1289122c2215add91cb86d520a72fd0815b6b6':
  Fix trace mismatch.
2011-01-25 10:32:39 -08:00
Sylvain Fonteneau
d8e4c1b3b2 am a2eced30: am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'a2eced302b7a5c4fea6d84c200dbdc5555f0d2b5':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:32:35 -08:00
John Wang
b761f681e8 am c3a5b19c: am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit 'c3a5b19c9518cf4cc7206a69015c96119bf35f73':
  Enable recovery in RIL wakelock release check.
2011-01-25 10:32:31 -08:00
Robert Greenwalt
678c6a358d am d14239a2: Merge "Fix tethering when switching default connection" into honeycomb
* commit 'd14239a2fb12d775f7b2345286d36ac02234e0a7':
  Fix tethering when switching default connection
2011-01-25 10:30:36 -08:00
Shimeng (Simon) Wang
1dc6b9ebc6 am c1e7f2d3: Merge "Set high usage delta to 1 to avoid constant V8 GC." into honeycomb
* commit 'c1e7f2d371aa6c2aa9ed3207689cb53a1f704cbc':
  Set high usage delta to 1 to avoid constant V8 GC.
2011-01-25 10:30:33 -08:00
Nick Pelly
cf1f20e701 am fd06cc10: resolved conflicts for merge of 0065f398 to honeycomb-plus-aosp
* commit 'fd06cc10ac372a737e37e764b0a01296e778226e':
  Add operands to mifare classic increment, decrement.
2011-01-25 10:30:11 -08:00
Arnaud Ferir
0d1289122c am 10ab8617: am 5e81a6e2: Fix trace mismatch.
* commit '10ab8617e85c9a675ff8251cd328beb4e047777c':
  Fix trace mismatch.
2011-01-25 10:29:59 -08:00
Sylvain Fonteneau
a2eced302b am e97a42e0: am c5a418ec: Handle mock tags in android.nfc.Tag conversion to Parcel.
* commit 'e97a42e05cced70dd5713c731a197187b4751800':
  Handle mock tags in android.nfc.Tag conversion to Parcel.
2011-01-25 10:29:51 -08:00
John Wang
c3a5b19c95 am 78eb9238: am 93300ce2: Merge "Enable recovery in RIL wakelock release check." into gingerbread
* commit '78eb92388ce30aee9b9aaa3e6c9a2de185f8d6a4':
  Enable recovery in RIL wakelock release check.
2011-01-25 10:29:44 -08:00
Robert Greenwalt
d14239a2fb Merge "Fix tethering when switching default connection" into honeycomb 2011-01-25 10:27:51 -08:00