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

31991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Gruber
fc6f9fd085 am 0357ec78: Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 
* commit '0357ec78b82ae104e56c26941d42fa7ef875462b':
  DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363
 2011-03-23 15:43:09 -07:00
shailendra
3f9e2b7a45 Merge "Fix for Media Server memory leak" into honeycomb-mr1 2011-03-23 15:33:51 -07:00
Bill Gruber
812183d7fd Merge "DRM API doc scrub This change contains information contributed by Sony Corporation. Bug: 4119363" into honeycomb-mr1 2011-03-23 14:58:31 -07:00
Scott Main
88c266e765 am ee7cfaf2: am 18cd686f: am ef6b305b: docs: fix markup error 
* commit 'ee7cfaf28969998ca15800f99bcdab2596051865':
  docs: fix markup error
 2011-03-23 14:47:34 -07:00
Scott Main
afff7413da am 18cd686f: am ef6b305b: docs: fix markup error 
* commit '18cd686fc828c9c75596de1494ecaa5467fcc195':
  docs: fix markup error
 2011-03-23 14:43:35 -07:00
Scott Main
4a70ce4ab2 am ef6b305b: docs: fix markup error 
* commit 'ef6b305b93009b60ad7c6ddbd200d1b5c554963f':
  docs: fix markup error
 2011-03-23 14:32:44 -07:00
Simon Wilson
f1b714e3a2 am 03aa986e: (-s ours) am 1ba4897e: Merge "DO NOT MERGE Change WiMAX indicator display" into gingerbread 
* commit '03aa986e6b19e436c71801d2e5af6f44521a94ab':
  DO NOT MERGE Change WiMAX indicator display
 2011-03-23 14:06:16 -07:00
repo sync
84aeb79def Merge "resolved conflicts for merge of 17f95e92 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-23 13:46:32 -07:00
Brad Fitzpatrick
1ec98a1eb5 am 2e383bc6: Merge "Making it possible to call SIP calls with special allowed chars." 
* commit '2e383bc6445b37d3b37fbc5b7620cd4716c5692c':
  Making it possible to call SIP calls with special allowed chars.
 2011-03-23 12:44:23 -07:00
Brad Fitzpatrick
133232d829 am 5d5a0ca5: Merge "Fixing the wrong link in YuvImage JavaDoc." 
* commit '5d5a0ca5ebc3f4f60b5ad2afc161b3b8b33953e7':
  Fixing the wrong link in YuvImage JavaDoc.
 2011-03-23 12:44:18 -07:00
Brad Fitzpatrick
2fc222d9cf Merge "Making it possible to call SIP calls with special allowed chars." 2011-03-23 12:33:39 -07:00
Brad Fitzpatrick
eb6bc968dd Merge "Fixing the wrong link in YuvImage JavaDoc." 2011-03-23 12:30:28 -07:00
Scott Main
a0ab9eb96f am 01b649aa: am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit '01b649aa3ac9a8c1d2aff03f51e66438092d0691':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:38:02 -07:00
Scott Main
424297ae99 am 7d02efa1: am fb340563: docs: add Asus driver link to oem driver page 
* commit '7d02efa1029435dfa3a4a9f8449ee1cbda543730':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:33:49 -07:00
Scott Main
66e284eab4 am fb340563: docs: add Asus driver link to oem driver page 
* commit 'fb340563e81f93bc179e51bffc846ac03ff02609':
  docs: add Asus driver link to oem driver page
 2011-03-23 10:25:00 -07:00
Robert Greenwalt
8b89aa870e am 0b6d0445: am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit '0b6d044567b9c3004eb7ed826fd593019cd24352':
  Fix adding of default route.
 2011-03-22 21:39:19 -07:00
Robert Greenwalt
352d2f647f am ac70fb8b: Merge "Fix adding of default route." into honeycomb-mr1 
* commit 'ac70fb8be6ea3a6b49d0a8a26e99c25f92013516':
  Fix adding of default route.
 2011-03-22 21:37:48 -07:00
Robert Greenwalt
3d41159231 Merge "Fix adding of default route." into honeycomb-mr1 2011-03-22 21:36:04 -07:00
Eric Rowe
1c3d217ee6 am 22e21da6: am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '22e21da663677d12768d38b95d65a747a4a0540b':
  Clean up BT stress tests.
 2011-03-22 19:00:57 -07:00
Eric Rowe
11381a9fa3 am 5e66ccf5: Merge "Clean up BT stress tests." into honeycomb-mr1 
* commit '5e66ccf5c41bd67e2b1b3f4cc4671af8e115fe7a':
  Clean up BT stress tests.
 2011-03-22 18:59:00 -07:00
Eric Rowe
a48f738d96 Merge "Clean up BT stress tests." into honeycomb-mr1 2011-03-22 18:57:27 -07:00
Wink Saville
8273962d6f am a97f49c0: Merge "Tweak RIL.java debug." into honeycomb-LTE 
* commit 'a97f49c02b68d94119f5171472bbadbbad26ba14':
  Tweak RIL.java debug.
 2011-03-22 16:07:23 -07:00
Wink Saville
ebbb2704e0 Merge "Tweak RIL.java debug." into honeycomb-LTE 2011-03-22 16:05:22 -07:00
Wink Saville
5a97fd933c am 5d612f16: Merge "Remove unused onResetDone." into honeycomb-LTE 
* commit '5d612f160180f6c1f59e6cece41c7c3b97b19bf1':
  Remove unused onResetDone.
 2011-03-22 15:32:23 -07:00
Wink Saville
70fd41bf35 Merge "Remove unused onResetDone." into honeycomb-LTE 2011-03-22 15:30:41 -07:00
Eric Fischer
03a0b0236d am b05f0b84: am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'b05f0b84b23729fcaa2dfe3955a4384b8c9cd440':
  Import revised translations.  DO NOT MERGE
 2011-03-22 14:01:10 -07:00
Eric Fischer
e0b5cead10 am 3a2575f7: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '3a2575f7e6b1f6da97bd8233dfd3baa8883c5610':
  Import revised translations.  DO NOT MERGE
 2011-03-22 13:59:20 -07:00
Teng-Hui Zhu
5a158def40 am 2c6f2816: am 5039e6da: Merge "fix for pause when loading" into honeycomb-mr1 
* commit '2c6f2816d7308693a89f1214c2976512eb275d8a':
  fix for pause when loading
 2011-03-22 13:58:16 -07:00
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