ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
28,923 Commits 2 Branches 0 Tags 54 MiB
b7434bbf93
Commit Graph

28923 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Simon Wilson
b7434bbf93 am 3d79f1ce: am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit '3d79f1ce84ee60dbb26468b9e5f75f4ccb5ed8aa':
  Attempt to reduce problems from issue #3183612
 2011-03-02 18:13:49 -08:00
Simon Wilson
5cd7131110 am edc68a00: Merge "Attempt to reduce problems from issue #3183612" into gingerbread 
* commit 'edc68a001cd94d2011029004cb27231432a18575':
  Attempt to reduce problems from issue #3183612
 2011-03-02 18:10:33 -08:00
Simon Wilson
4abb1f078d Merge "Attempt to reduce problems from issue #3183612" into gingerbread 2011-03-02 18:03:52 -08:00
Mike Lockwood
1c5750c374 am b13581a9: (-s ours) am 1110748b: DO NOT MERGE: USB accessory support library 
* commit 'b13581a9dab07ccd1841890e0443b9cfe0805679':
  DO NOT MERGE: USB accessory support library
 2011-03-02 17:24:14 -08:00
Mike Lockwood
42419d6c6f am 7866be2b: (-s ours) am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread 
* commit '7866be2b76e421ca28e5dcbd3e7d362baf279dd9':
  DO NOT MERGE: Backport USB accessory support to gingerbread
 2011-03-02 17:24:02 -08:00
Mike Lockwood
f57923aacc am 1110748b: DO NOT MERGE: USB accessory support library 
* commit '1110748b2df664f9c5066819c1f0616eae3394a7':
  DO NOT MERGE: USB accessory support library
 2011-03-02 15:38:55 -08:00
Mike Lockwood
a36e6bf8d1 am 40bbf929: DO NOT MERGE: Backport USB accessory support to gingerbread 
* commit '40bbf9295d5245d3917629ce15f7b37670aef1ac':
  DO NOT MERGE: Backport USB accessory support to gingerbread
 2011-03-02 15:16:32 -08:00
Jason Chen
f4bc6b0649 am d616d505: Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb 
* commit 'd616d5054f5e93f6a492896e7d8dd6d5b7eaa84b':
  Bugfixes in StaticLayout. DO NOT MERGE.
 2011-03-01 17:57:56 -08:00
Jason Chen
5c2aaabb9a Merge "Bugfixes in StaticLayout. DO NOT MERGE." into honeycomb 2011-03-01 17:56:06 -08:00
Jason Chen
aa11f79c80 am ef7aed89: Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb 
* commit 'ef7aed89b610d0bd63ad7a1422b8db85730cb917':
  DO NOT MERGE Cherry-pick of cd59febcea2 from master
 2011-03-01 17:54:26 -08:00
Jason Chen
9f28fffe97 Merge "DO NOT MERGE Cherry-pick of cd59febcea2 from master" into honeycomb 2011-03-01 17:50:51 -08:00
Amith Yamasani
532274b190 am df33b8c5: Merge "Check for NTP time as soon as WIFI is connected." into honeycomb 
* commit 'df33b8c51d431a7c0f7a89ead8dfacdd3660ff48':
  Check for NTP time as soon as WIFI is connected.
 2011-03-01 15:50:41 -08:00
Amith Yamasani
03e3b90862 Merge "Check for NTP time as soon as WIFI is connected." into honeycomb 2011-03-01 15:47:57 -08:00
Eric Fischer
6c0a5000f6 am 86b7a597: Import revised translations. DO NOT MERGE 
* commit '86b7a59726010e0952b0ede4fd40d933aeb83384':
  Import revised translations.  DO NOT MERGE
 2011-03-01 14:41:39 -08:00
Costin Manolache
fbbb4a338e am 66d46ac6: (-s ours) am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 
* commit '66d46ac61478c967ed45bd1c27b0436654d54299':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
 2011-03-01 13:28:03 -08:00
Costin Manolache
a880e1e731 am db52ab69: Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 
* commit 'db52ab69f22e24615eaa2e8f9845e157426d3dd6':
  DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions.
 2011-03-01 12:29:40 -08:00
Costin Manolache
a9869cf37b Merge "DO NOT MERGE Backport (with modifications ) some changes from Honeycomb, that would allow authenticators to control caching and permissions." into gingerbread 2011-03-01 12:25:21 -08:00
Dianne Hackborn
20cad7c563 am 7fff2d19: am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '7fff2d19a24f9f9b669676864dc5652ab179d2fc':
  Fix leak when keylock is recreated.
 2011-03-01 11:13:14 -08:00
Jaikumar Ganesh
710fb0bb55 am 516393fa: am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '516393faba128ce43bee98b6319e060744fe7be6':
  Phone crash when old callback func is woken up when enabling BT.
 2011-03-01 11:12:56 -08:00
Mike Corrigan
a7d25a312f am bd15112a: Fix the display priority of the airplane mode icon. 
* commit 'bd15112a29eefb93e62235574b694746044c9261':
  Fix the display priority of the airplane mode icon.
 2011-03-01 11:08:45 -08:00
Mike Lockwood
8c18b5f38b am c01e201f: (-s ours) am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit 'c01e201f12149ca96593af4e18133d3b2fce5546':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-03-01 09:12:49 -08:00
Mike Lockwood
bcf65037d2 am fc88f94f: (-s ours) am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit 'fc88f94fc32fc010b153af32dea8e1fd4bae1f19':
  DO NOT MERGE: Clean up USB notifications:
 2011-03-01 09:12:45 -08:00
Mike Lockwood
dd4af71b98 am 54e96c69: (-s ours) am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '54e96c69d068593f1d5893be6067509b07abdadc':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-03-01 09:12:31 -08:00
Mike Lockwood
879ff09c2a am f41768c5: (-s ours) am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f41768c5837a078239e92d8fa1d2155394e4b6ac':
  Give system server permission to access USB. DO NOT MERGE
 2011-03-01 09:12:27 -08:00
Xavier Ducrohet
f2ac085586 am 7b972755: (-s ours) am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit '7b9727558b42aecacd0ea63cf3b3c89e9bfd9e9b':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-03-01 09:12:15 -08:00
Dianne Hackborn
795af4d938 am 1de4a2ca: am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '1de4a2ca58df9bd21e054742f52e0af7a2ed5864':
  Fix leak when keylock is recreated.
 2011-02-28 18:06:46 -08:00
Dianne Hackborn
5b18439050 am 62619392: Merge "Fix leak when keylock is recreated." 
* commit '626193926df0b3c7236e5c244f30d797d9192e0d':
  Fix leak when keylock is recreated.
 2011-02-28 18:03:12 -08:00
Dianne Hackborn
b00d5d94d6 Merge "Fix leak when keylock is recreated." 2011-02-28 17:54:54 -08:00
Jaikumar Ganesh
98a22899cc am 9711b9b7: am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '9711b9b7aa7448b44b85fe8158ded0364cc3540e':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:27:16 -08:00
Wink Saville
c855e277af am 0eb6af89: Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb 
* commit '0eb6af892948ba23bf9de5c5a6172c6ec50f8f71':
  Fixing the write of BackgroundData setting, DO NOT MERGE.
 2011-02-28 16:00:22 -08:00
Jaikumar Ganesh
03100c7446 am 1eefb529: Merge "Phone crash when old callback func is woken up when enabling BT." 
* commit '1eefb529c78be5336f6c8a1b8ac2c32e268d4294':
  Phone crash when old callback func is woken up when enabling BT.
 2011-02-28 16:00:01 -08:00
Wink Saville
47e42beb12 Merge "Fixing the write of BackgroundData setting, DO NOT MERGE." into honeycomb 2011-02-28 15:54:02 -08:00
Jaikumar Ganesh
51e164ad73 Merge "Phone crash when old callback func is woken up when enabling BT." 2011-02-28 15:33:34 -08:00
Eric Fischer
68e75a92e4 am 04a536af: Merge "Import revised translations. DO NOT MERGE" into honeycomb 
* commit '04a536af3c91fc78d07a7d5b242a40b2731ec0ff':
  Import revised translations.  DO NOT MERGE
 2011-02-28 14:08:39 -08:00
Eric Fischer
06ab2ea22d Merge "Import revised translations. DO NOT MERGE" into honeycomb 2011-02-28 14:05:59 -08:00
Irfan Sheriff
0c37e6b180 am f9e2a491: Fix issue to clear scan alarms 
* commit 'f9e2a491176b086cd3c238b209e025cd68d76001':
  Fix issue to clear scan alarms
 2011-02-28 14:05:06 -08:00
Mike Lockwood
b999303b88 am 61c1bb4f: Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 
* commit '61c1bb4fef439650a3b88131c6e1360ffc03a7ed':
  UsbService: Remove stack-trace message during boot. DO NOT MERGE
 2011-02-28 13:18:06 -08:00
Mike Lockwood
b115c2440e am 6da062a9: Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 
* commit '6da062a96c6f8126aad450a937144fab4333488f':
  DO NOT MERGE: Clean up USB notifications:
 2011-02-28 13:18:02 -08:00
Mike Lockwood
faaee3b419 am 3333f8af: Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 
* commit '3333f8afb2d1eae8bfdb41fa87f86836ad8702f7':
  DO NOT MERGE UsbManager: squashed commit of:
 2011-02-28 13:17:58 -08:00
Mike Lockwood
4b0caf3b83 am f7b99b32: Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 
* commit 'f7b99b32ad7a4872376355acabb5984142ba5e75':
  Give system server permission to access USB. DO NOT MERGE
 2011-02-28 13:17:54 -08:00
Mike Lockwood
1630f54d5b Merge "UsbService: Remove stack-trace message during boot. DO NOT MERGE" into gingerbread 2011-02-28 13:12:11 -08:00
Mike Lockwood
93314ad737 Merge "DO NOT MERGE: Clean up USB notifications:" into gingerbread 2011-02-28 13:12:03 -08:00
Mike Lockwood
58a10b93fd Merge "DO NOT MERGE UsbManager: squashed commit of:" into gingerbread 2011-02-28 13:11:55 -08:00
Mike Lockwood
f001d16081 Merge "Give system server permission to access USB. DO NOT MERGE" into gingerbread 2011-02-28 13:11:37 -08:00
Xavier Ducrohet
c6a02ff532 am edbd6139: Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 
* commit 'edbd6139b9d699879db2f14fb03b7b6a38bab9ea':
  Merge 1911a6f7 into gingerbread. do not merge.
 2011-02-28 12:29:08 -08:00
Xavier Ducrohet
13fbf42721 Merge "Merge 1911a6f7 into gingerbread. do not merge." into gingerbread 2011-02-28 12:24:01 -08:00
Daniel Sandler
d85518e2e3 am 5404812d: Merge "When out of range, show device-appropriate no-signal bars." into honeycomb 
* commit '5404812dee9dccbbd43df81752f3061742235982':
  When out of range, show device-appropriate no-signal bars.
 2011-02-28 11:26:53 -08:00
Daniel Sandler
f0e1607265 Merge "When out of range, show device-appropriate no-signal bars." into honeycomb 2011-02-28 11:17:38 -08:00
Jean-Baptiste Queru
eed59e4fb4 am 79b66725: am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit '79b66725b7755e403e10a9d073121789f09b1a9e':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 11:05:55 -08:00
Jean-Baptiste Queru
5651616a91 am 25be2c72: am e0537f18: Merge "Fix of tearDown() in SingleLaunchActivityTestCase." 
* commit '25be2c725eba1c94c7fc700e37b194fdcd83a1fb':
  Fix of tearDown() in SingleLaunchActivityTestCase.
 2011-02-28 10:18:30 -08:00