ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
32,163 Commits 2 Branches 0 Tags 54 MiB
098c69629b
Commit Graph

32163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
3e8b4373f1 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-22 13:56:47 -07:00
Teng-Hui Zhu
632de2d17f am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '5039e6da1e74c0a0c10772f585ea4e5e6bcf0a16':
  fix for pause when loading
 2011-03-22 13:56:35 -07:00
Teng-Hui Zhu
ae01e99c1a Merge "fix for pause when loading" into honeycomb-mr1 2011-03-22 13:55:28 -07:00
Dianne Hackborn
175e5cdd6e am b382a054: am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1 
* commit 'b382a0543938e3161a26615e03d0929ba75ea705':
  Now have a final API 12.
 2011-03-22 13:04:56 -07:00
Dianne Hackborn
594b57954b am 8dcd6647: Merge "Now have a final API 12." into honeycomb-mr1 
* commit '8dcd66476069c9241c2acbbafc1a85e42bd7a303':
  Now have a final API 12.
 2011-03-22 13:01:19 -07:00
Dianne Hackborn
38475e7294 Merge "Now have a final API 12." into honeycomb-mr1 2011-03-22 12:58:00 -07:00
shailendra
82daa0c611 am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit 'b819dcd49ddd4be8f102c99576bb42cd088caf1a':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:52:25 -07:00
shailendra
5096f083b6 am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:50:15 -07:00
shailendra
6e7b75f517 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
repo sync
622c97d769 resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp 
Change-Id: Ic82ab20e216d810f6372c833ac49c3856449c09c
 2011-03-22 11:47:39 -07:00
Gloria Wang
94bfd3bed9 am 01240177: am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit '012401774f4aac29ad8cf8e32f36c4a521842767':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:08:38 -07:00
Gloria Wang
79ee4c6b6e am 3cc797b9: Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 
* commit '3cc797b9c416e01ad6bfab5f2bfb2c6cbf9e44ed':
  Add one more field in DecryptHandle to support bug 4126624
 2011-03-22 11:06:43 -07:00
Gloria Wang
cbd0c8a74f Merge "Add one more field in DecryptHandle to support bug 4126624" into honeycomb-mr1 2011-03-22 11:04:32 -07:00
Nick Pelly
7821c1bd81 am e69f4267: Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 
* commit 'e69f4267e1cdf5353fffa99a0d49f4c9069415b9':
  NfcAdapterExtras: reset singleton state if initialization fails.
 2011-03-22 10:14:36 -07:00
Nick Pelly
54b76288d4 Merge "NfcAdapterExtras: reset singleton state if initialization fails." into gingerbread 2011-03-22 09:52:55 -07:00
Andreas Huber
1bc4e51040 am 3da10728: am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 
* commit '3da107288d5ae112073875ac10317def3c299818':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
 2011-03-22 08:55:51 -07:00
Andreas Huber
bb76e23360 am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
 2011-03-22 08:48:58 -07:00
Andreas Huber
2a15f0fb93 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -07:00
Teng-Hui Zhu
d648f7366a am f2c44a79: am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit 'f2c44a79d90096e5f0edf698e27d291d439f0138':
  Fix a crash
 2011-03-21 18:16:02 -07:00
Yu Shan Emily Lau
59eaba8b72 am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '112852b5770300a81d82f0ec06ad0553f286ed01':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-21 18:14:12 -07:00
Gloria Wang
01facd0ad0 am 4f87a46e: am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 
* commit '4f87a46e6f1a8ba601a320c902abc3d5ce010674':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
 2011-03-21 18:14:09 -07:00
Justin Ho
6e0035ceb3 am 6a211610: am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '6a21161095326d097a1af3930b4af0d2470abe0b':
  Fixing list selector theme Bug: 4147203
 2011-03-21 18:14:06 -07:00
Teng-Hui Zhu
da63f57cb6 am 039aa81a: Merge "Fix a crash" into honeycomb-mr1 
* commit '039aa81a67465f189c24f92567ccb08ed8a5dce2':
  Fix a crash
 2011-03-21 18:13:21 -07:00
Teng-Hui Zhu
0cccea1543 Merge "Fix a crash" into honeycomb-mr1 2011-03-21 18:09:57 -07:00
Andreas Huber
cf9c475885 am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away. 
* commit '970d7dd95f704fb068c8add784f5b8c1c17ebd3c':
  If nothing is to be copied, return right away.
 2011-03-21 18:05:50 -07:00
Simon Wilson
dd9d07bac6 am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit '1ba4897e89fc30042a086b26755dfdb80af258dd':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-21 18:02:57 -07:00
Yu Shan Emily Lau
7eca96ee8d am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-21 18:00:32 -07:00
Gloria Wang
df2d7283d9 am 7abedd0c: Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 
* commit '7abedd0cdefdcd6d3b62808724e721bb1b92b185':
  do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624.
 2011-03-21 18:00:30 -07:00
Justin Ho
6c75f56b1c am 9db9a7d3: Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 
* commit '9db9a7d3f4428552b3ce553df5184bcbbe8db8dd':
  Fixing list selector theme Bug: 4147203
 2011-03-21 17:59:59 -07:00
Yu Shan Emily Lau
10399b194f Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Gloria Wang
838c9844f7 Merge "do not merge: Cherry pick change I6529695c from master to partially fix bug 4126624." into honeycomb-mr1 2011-03-21 17:26:03 -07:00
Simon Wilson
3614b4772e Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 2011-03-21 16:58:41 -07:00
Justin Ho
6967dd8e24 Merge "Fixing list selector theme Bug: 4147203" into honeycomb-mr1 2011-03-21 16:52:35 -07:00
Teng-Hui Zhu
93f60444b1 am f82e5a2c: am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit 'f82e5a2c903d16b6ca35313e184462625d482ff1':
  Support loading image and paused image for inline video
 2011-03-21 16:28:04 -07:00
Andreas Huber
4c7fba719a am e2c32e9f: If nothing is to be copied, return right away. 
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
 2011-03-21 16:21:29 -07:00
Teng-Hui Zhu
8960381aa9 am 0b933c02: Merge "Support loading image and paused image for inline video" into honeycomb-mr1 
* commit '0b933c02dddbc325498b3b73d8be9167b155801b':
  Support loading image and paused image for inline video
 2011-03-21 14:19:29 -07:00
Teng-Hui Zhu
0953e89934 Merge "Support loading image and paused image for inline video" into honeycomb-mr1 2011-03-21 14:01:10 -07:00
Fred Quintana
3a3926ac51 am 661e9b37: Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 
* commit '661e9b371fcc1a2aec5dfd74f2cc65db1d8a77d5':
  remove the code that clears the passwords when the sim is replaced with a different one.
 2011-03-21 11:33:34 -07:00
Fred Quintana
3e4bb01174 Merge "remove the code that clears the passwords when the sim is replaced with a different one." into gingerbread 2011-03-21 11:04:23 -07:00
Justin Ho
1ffa55568a am 38cf000a: am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '38cf000a541206769ad7686936e49bf0c1e417b9':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:56:41 -07:00
Justin Ho
a50dad82b5 am 5e35c485: Updated 3G and wifi traffic indicators 
* commit '5e35c4855a972960403a10811882ebded8945006':
  Updated 3G and wifi traffic indicators
 2011-03-21 10:54:51 -07:00
Mike Lockwood
a184027848 am 9a612b54: (-s ours) am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '9a612b545e2c5249bfd8ef2b7673197b8f214cbd':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:49:21 -07:00
Mike Lockwood
1b085405ba am 65de3c76: DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting 
* commit '65de3c76874386a5c1ffd26690451ecdef972a9e':
  DO NOT MERGE: UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:37:33 -07:00
Mike Lockwood
764bc9df66 am 56063c8d: am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit '56063c8d62d0574409a8150d580993c8d8e0f14f':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:33:01 -07:00
Mike Lockwood
ba33281a5f am dd76dc02: Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 
* commit 'dd76dc0297f4c39fefbbc1ac23d9b1add187d9e9':
  UsbService: Handle the case where a USB accessory connects as the device is booting
 2011-03-20 17:25:09 -07:00
Mike Lockwood
731d1353d3 Merge "UsbService: Handle the case where a USB accessory connects as the device is booting" into honeycomb-mr1 2011-03-20 17:08:24 -07:00
Jamie Gennis
09bb22afae am b368f4d8: am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 
* commit 'b368f4d85d8b5e567f605c991a6c5c6ff1c868d8':
  SurfaceFlinger: Fix a typo.
 2011-03-18 17:36:51 -07:00
Jamie Gennis
560fe009e5 am 38caff23: Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 
* commit '38caff230d1ee52701cc8cffde0309b91c2016d6':
  SurfaceFlinger: Fix a typo.
 2011-03-18 17:34:27 -07:00
Jamie Gennis
d32a694a0c Merge "SurfaceFlinger: Fix a typo." into honeycomb-mr1 2011-03-18 17:32:25 -07:00
Eric Fischer
0c8f2bd227 am 9ac82606: (-s ours) am c0604255: Merge "Import revised translations. DO NOT MERGE" into gingerbread 
* commit '9ac8260608224f182ac5a20e50ce4352334a09ba':
  Import revised translations.  DO NOT MERGE
 2011-03-18 16:53:45 -07:00