Commit Graph

26296 Commits

Author SHA1 Message Date
Nick Pelly
562cae3549 am 18adceb4: am a29bf14e: Merge "New Intent defined for RF ON/OFF events" into gingerbread
* commit '18adceb4273655b6cf8eaa9c6a2237d6fc1b8881':
  New Intent defined for RF ON/OFF events
2011-01-13 10:26:28 -08:00
Brad Fitzpatrick
a3faee6937 am 54f428a6: am bdb7aee0: Merge "Fix for crash when setting live wallpaper."
* commit '54f428a63f33f4722c09b7688e6ca7960394f81f':
  Fix for crash when setting live wallpaper.
2011-01-13 10:26:19 -08:00
Kenny Root
c6c67736c2 am 47075079: (-s ours) am e8c04db7: Merge "Add the {get,set}PackageObbPaths calls to API" into gingerbread
* commit '470750793b6e930a323ee63cbed05c43dc435ba1':
  Add the {get,set}PackageObbPaths calls to API
2011-01-13 10:26:13 -08:00
James Dong
b13f8d5a49 am c14b10c3: Merge "Add audio encoding parameters check" into honeycomb
* commit 'c14b10c3068359b717b3f35b7218ce0e6dcdd08c':
  Add audio encoding parameters check
2011-01-13 10:24:44 -08:00
Svetoslav Ganov
ad4b2fd042 am 06e32b43: Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb
* commit '06e32b434b62b22eeee900851ff56f2098ddc019':
  Updating the WebView accessibility key bindings after discussion with the access-eng team
2011-01-13 10:24:38 -08:00
James Dong
0e1e796ae6 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Jaikumar Ganesh
b98cf7051f am b54fd91d: Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb
* commit 'b54fd91d1b843b7742bf6396cefa6c63b14dc6df':
  Phone crash when old callback func is woken up when enabling BT.
2011-01-13 10:21:15 -08:00
Alex Sakhartchouk
62a4b9fee2 am d88ad4ab: Merge "Documentation" into honeycomb
* commit 'd88ad4ab49280a19da6582ba6e776c296be79ec0':
  Documentation
2011-01-13 10:20:28 -08:00
Robert Greenwalt
63576855ac am 495056ab: Merge "Turn off DUN connection after tethering." into honeycomb
* commit '495056ab6709bbf77879a4b556aa1d17446bfe48':
  Turn off DUN connection after tethering.
2011-01-13 10:19:39 -08:00
Gilles Debunne
41df0d0cc4 am b439221a: Merge "QuickContactBadge shows its pressed state" into honeycomb
* commit 'b439221a5aa7c36fedb242ee9180ce46e4ad19b7':
  QuickContactBadge shows its pressed state
2011-01-13 10:19:30 -08:00
Svetoslav Ganov
037c884f86 Merge "Updating the WebView accessibility key bindings after discussion with the access-eng team" into honeycomb 2011-01-13 10:17:02 -08:00
Jaikumar Ganesh
273537b56a Merge "Phone crash when old callback func is woken up when enabling BT." into honeycomb 2011-01-13 10:14:40 -08:00
Alex Sakhartchouk
c927792bed Merge "Documentation" into honeycomb 2011-01-13 10:14:14 -08:00
Robert Greenwalt
774502bc13 Merge "Turn off DUN connection after tethering." into honeycomb 2011-01-13 10:02:29 -08:00
Gilles Debunne
b278f1e541 Merge "QuickContactBadge shows its pressed state" into honeycomb 2011-01-13 09:50:40 -08:00
Jason parks
7180ea8aec am 21f62b9e: Merge "Add a method enable encryption." into honeycomb
* commit '21f62b9e461416ae61c8471f7199f104f8fe33de':
  Add a method enable encryption.
2011-01-13 07:44:55 -08:00
Jason parks
2b851f3dc0 am ca6777b2: Merge "Remove the APIs for the old encryption scheme." into honeycomb
* commit 'ca6777b23bbe9283380efb2ba7e6d0a79d8669db':
  Remove the APIs for the old encryption scheme.
2011-01-13 07:42:55 -08:00
Jason parks
5bf379e5b6 Merge "Add a method enable encryption." into honeycomb 2011-01-13 07:41:53 -08:00
Jason parks
0d99621dcf Merge "Remove the APIs for the old encryption scheme." into honeycomb 2011-01-13 07:40:46 -08:00
Marco Nelissen
fb454c76a1 am f679ba7d: Cherrypick from GB. Do Not Merge.
* commit 'f679ba7d944a403fbdc77926c44978ffd5161f2d':
  Cherrypick from GB. Do Not Merge.
2011-01-13 07:31:53 -08:00
Ben Murdoch
afb77eca7b am 6b3dc7a2: Merge "Improve error handling (NPE in DRT2)" into honeycomb
* commit '6b3dc7a29a5c642c6ca2214c47199dec71912d0d':
  Improve error handling (NPE in DRT2)
2011-01-13 06:47:45 -08:00
Ben Murdoch
07c8c0244e Merge "Improve error handling (NPE in DRT2)" into honeycomb 2011-01-13 06:46:17 -08:00
Wink Saville
e45060548f am 5bf6cc01: Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb
* commit '5bf6cc0126b5e554f629bb4c96716a2a5701d04b':
  Initialize mOtaspMode to OTASP_UNKNOWN.
2011-01-13 06:26:23 -08:00
Wink Saville
67c43240ae Merge "Initialize mOtaspMode to OTASP_UNKNOWN." into honeycomb 2011-01-13 06:24:09 -08:00
Shih-wei Liao
69014d73ab am 96100195: Fix the build.
* commit '96100195f06d9be287f2577a41f498917b34f7ef':
  Fix the build.
2011-01-13 02:23:21 -08:00
Shih-wei Liao
bb6e33b49a am 078717be: Merge "Disable on-device linking" into honeycomb
* commit '078717be074e4f68b9af37d70ecbd63702b2be6c':
  Disable on-device linking
2011-01-13 02:07:53 -08:00
Shih-wei Liao
632db906ca am c758f1c6: Merge "Fix the build." into honeycomb
* commit 'c758f1c6a3bd0a65c85572847903c44307d04237':
  Fix the build.
2011-01-13 02:07:48 -08:00
Shih-wei Liao
dfd144493d am f6dd9c53: Merge "On-device linking." into honeycomb
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.
2011-01-13 02:07:39 -08:00
Shih-wei Liao
00d5ddb396 Merge "Disable on-device linking" into honeycomb 2011-01-13 02:06:17 -08:00
Shih-wei Liao
44c0cda62d am 3ae5017b: Merge "convert2uchar3." into honeycomb
* commit '3ae5017b1bc2910610194cc8790e8d96516ac9b5':
  convert2uchar3.
2011-01-13 02:05:32 -08:00
Shih-wei Liao
6ae6459e5b Merge "Fix the build." into honeycomb 2011-01-13 02:04:10 -08:00
Shih-wei Liao
ddd39c9199 Merge "On-device linking." into honeycomb 2011-01-13 02:04:00 -08:00
Shih-wei Liao
93d5b249f8 Merge "convert2uchar3." into honeycomb 2011-01-13 02:03:51 -08:00
Adam Powell
0cbded3c88 am 2ea9aaa2: Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb
* commit '2ea9aaa2458ca468b8f127d8c69746a009df12a6':
  Fix bugs 3077517 and 3309579 - ListView bugs
2011-01-12 23:52:25 -08:00
Adam Powell
ab6ab09b63 Merge "Fix bugs 3077517 and 3309579 - ListView bugs" into honeycomb 2011-01-12 23:50:05 -08:00
Guang Zhu
f04d3cc27c am 37f81344: Merge "change webkit test data path" into honeycomb
* commit '37f813443dbe51277c2d849eb2b53caa137d50f7':
  change webkit test data path
2011-01-12 23:32:00 -08:00
Guang Zhu
79e734ace3 Merge "change webkit test data path" into honeycomb 2011-01-12 23:29:53 -08:00
Justin Ho
287732aedf am cd0331ab: Fixing broken dropdown asset in Honeycomb as well
* commit 'cd0331abd7eb1e9efff3251caa008492fe5cad35':
  Fixing broken dropdown asset in Honeycomb as well
2011-01-12 22:59:33 -08:00
Andy Stadler
fc038a6863 am 7b0f8f08: API changes to support encryption in DPM
* commit '7b0f8f08ac7b3ed5cf462b92283713b033d6a64a':
  API changes to support encryption in DPM
2011-01-12 21:17:03 -08:00
Jaikumar Ganesh
331400f8b8 am 471de1f5: (-s ours) am c8f42fb6: Merge "DO NOT MERGE: Remove auto connection on ACL connection." into gingerbread
* commit '471de1f5b3cc629739d8315ff195d6af928e7ae4':
  DO NOT MERGE: Remove auto connection on ACL connection.
2011-01-12 20:48:51 -08:00
Eric Laurent
67639b59be am 48f400c3: am bec4abaa: Merge "Fix issue 3302649." into gingerbread
* commit '48f400c3762bd50603222cb5e7856d6aef4ebc4e':
  Fix issue 3302649.
2011-01-12 20:48:44 -08:00
Justin Ho
42a3c20b82 am 58ea9394: (-s ours) am 7b667a0c: Merge "Updated flightmode assets" into gingerbread
* commit '58ea93945b6cd7b91d2d54845275fd90ee7fb291':
  Updated flightmode assets
2011-01-12 20:48:38 -08:00
Chet Haase
a4174f5cc1 am 7cc5e1d5: Merge "Fix null crash when fragments go away during animations" into honeycomb
* commit '7cc5e1d5488c9e0a3f898a62b626ffb3ae074440':
  Fix null crash when fragments go away during animations
2011-01-12 20:36:59 -08:00
Chet Haase
593d9a93d9 Merge "Fix null crash when fragments go away during animations" into honeycomb 2011-01-12 20:34:32 -08:00
Christopher Tate
aa0f983743 am 44a94bb5: Merge "Turn off debugging logspam for release" into honeycomb
* commit '44a94bb5a915922400944f666b218f4bb268c565':
  Turn off debugging logspam for release
2011-01-12 20:25:32 -08:00
Christopher Tate
c130476861 Merge "Turn off debugging logspam for release" into honeycomb 2011-01-12 20:23:49 -08:00
Jim Miller
b9b09ff161 am 66707eee: Merge "Fix 3253629: Tweaks to recent apps" into honeycomb
* commit '66707eee84ee874f60ff5d25c5d2d00769e79616':
  Fix 3253629: Tweaks to recent apps
2011-01-12 20:10:28 -08:00
Jim Miller
efee4a3538 Merge "Fix 3253629: Tweaks to recent apps" into honeycomb 2011-01-12 20:07:36 -08:00
Kenny Root
6b9b818948 am 0ee29447: am 6688b6c3: Merge "Allow updated system apps to retain priority" into gingerbread
* commit '0ee294470d09e1de0ce0fe6e3246e98e450a4d26':
  Allow updated system apps to retain priority
2011-01-12 19:01:48 -08:00
Andreas Huber
d81436b00d am c88b2c44: am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.
* commit 'c88b2c44117e7e3ff3deb786f7d984f4096a63de':
  Fail to parse duration instead of asserting, if the server response cannot be parsed.
2011-01-12 19:01:37 -08:00