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

35153 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
2ac75c1f4b Merge "Copy pointer assets for hdpi." 2011-06-06 13:14:13 -07:00
Nick Pelly
3734299b72 am 92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 
* commit '92279c0fa1c15bd4afaf051bed90776fa64744c1':
 2011-06-06 12:57:32 -07:00
TK MUN
b8e736140b am 51704fc9: am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit '51704fc9c2f42e72a86f580c3e2aa977e8b6b006':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 12:57:24 -07:00
Eric Fischer
b0387cd209 am e34ed24f: (-s ours) am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e34ed24f4d32ad20716caf3056a7b007a0277500':
  Import revised translations.  DO NOT MERGE
 2011-06-06 12:57:14 -07:00
Jaikumar Ganesh
6f027fecc1 am 5aaed097: am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '5aaed0970be451479a07b2423e709026dec6611b':
  Require bonding and encryption for PBAP server
 2011-06-06 12:56:55 -07:00
Jean-Baptiste Queru
ac953eef76 am 59242cf6: am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '59242cf65ec775ccb6cb3639df4eab6af09f3108':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 12:56:29 -07:00
Marco Nelissen
4851d29b9b Merge "resolved conflicts for merge of b2fd84ad to master" 2011-06-06 12:33:40 -07:00
Marco Nelissen
8539ca29e6 resolved conflicts for merge of b2fd84ad to master 
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
 2011-06-06 12:30:40 -07:00
Nick Pelly
78c3bed118 Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp 2011-06-06 11:52:21 -07:00
TK MUN
82ce6dbd85 am cecb710a: am 94260caf: Allow control over search order for tethering upstream interface selection 
* commit 'cecb710a6de249a3847da2f07464a1aecf9459ac':
  Allow control over search order for tethering upstream interface selection
 2011-06-06 11:51:22 -07:00
Eric Fischer
f89c33c4d1 am e9d32283: am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'e9d32283e4eca1ee27218ed66f754a694678ac6d':
  Import revised translations.  DO NOT MERGE
 2011-06-06 11:50:16 -07:00
RoboErik
a6d8c10bd6 Merge "Cleanup of Calendar.java to prep for api" 2011-06-06 11:39:40 -07:00
Jaikumar Ganesh
63a89d789f am 58ada2f3: am 94062517: Merge "Require bonding and encryption for PBAP server" 
* commit '58ada2f3bbab749fb5a813fb8f82eee347080405':
  Require bonding and encryption for PBAP server
 2011-06-06 11:34:11 -07:00
Jean-Baptiste Queru
6b078036f6 am 54ab72e1: am 038e8f99: Merge "Adding support for parsing of SMS-CB pdus in UMTS format." 
* commit '54ab72e1c389905adb074bd7c799a33b4f513679':
  Adding support for parsing of SMS-CB pdus in UMTS format.
 2011-06-06 11:33:52 -07:00
Eric Fischer
8f2bc7998d am b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 
* commit 'b16b020dd32147fbaaf7de47d5de16bfee10967a':
  Import revised translations.  DO NOT MERGE
 2011-06-06 10:54:41 -07:00
Alex Sakhartchouk
cb3915721d Merge "Unhiding render target code for renderscript" 2011-06-06 10:54:26 -07:00
Eric Fischer
2768505342 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-06-06 10:38:42 -07:00
Marco Nelissen
0129f1a27f resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp 
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
 2011-06-06 09:55:15 -07:00
John Reck
5d50ae60e8 Merge "Delay set picture if necessary" 2011-06-06 09:25:44 -07:00
Glenn Kasten
7194cca8dc Merge "Remove dead code related to gettid" 2011-06-06 09:12:05 -07:00
Marco Nelissen
b3fc75d18f Merge "Add WebP Mime-Type support in Android Media File" 2011-06-06 08:21:07 -07:00
Shih-wei Liao
edc0bea898 Merge "Fix the false-alarm bug when we skip to the end, which should be OK." 2011-06-05 00:58:40 -07:00
Wink Saville
7eb346560b Merge "resolved conflict for merge of fc51aaec to master" 2011-06-04 08:19:00 -07:00
Daniel Sandler
0430c20973 Merge "Fix the status bar test app." 2011-06-04 07:38:08 -07:00
Wink Saville
cab3aeb6f1 resolved conflict for merge of fc51aaec to master 
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
 2011-06-04 07:31:35 -07:00
Wink Saville
58ac798e45 am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 
* commit '6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
  Add FileUtils.checksumCrc32
 2011-06-04 06:24:40 -07:00
Wink Saville
a3bd4c076b Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE 2011-06-04 06:15:21 -07:00
Romain Guy
ba16c2cd88 Merge "Measure text with the appropriate text encoding. Bug #4546327" 2011-06-03 18:52:41 -07:00
Dianne Hackborn
78429929bc am 7e5ca578: am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit '7e5ca5781b406d4f862254dad1758b91ce89f896':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 18:02:10 -07:00
Roman Nurik
28538f4521 am 16475a3a: am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '16475a3a40beac982886ce6bc300f4ffe29f581d':
  Add old blog posts as articles, batch 1
 2011-06-03 18:02:01 -07:00
Dianne Hackborn
7fdd052670 am e826feb6: am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'e826feb66c2a3690716136c24926606eafe827dc':
  Fix when managed cursors are required.
 2011-06-03 18:01:57 -07:00
Robert Greenwalt
6ea2cc50a3 am 89c1eb8e: am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE 
* commit '89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
  Promote Telephony's isDataPossible.
 2011-06-03 18:01:46 -07:00
Dianne Hackborn
d7ee0a04ef am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'b4815f47e6d612da6e2d0650a2d8f103626e3ec7':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:57:33 -07:00
Dianne Hackborn
4d3177dfda am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 
* commit 'bd754205d0b59315582855329649dad925a04b82':
  Fix to not lose state when saving a deactivated fragment.
 2011-06-03 17:54:28 -07:00
Dianne Hackborn
77a171c55c Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2 2011-06-03 17:52:23 -07:00
James Dong
9a1147d920 Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h" 2011-06-03 17:43:20 -07:00
James Dong
7c1a4726c5 Merge "Initial-checkin for ON2 Software AVC/H264 decoder" 2011-06-03 17:42:31 -07:00
Roman Nurik
9170daa541 am 07613835: am e7d60078: Add old blog posts as articles, batch 1 
* commit '076138357027189f1bb90caf8c2e1a09497d78ac':
  Add old blog posts as articles, batch 1
 2011-06-03 17:40:11 -07:00
Christopher Tate
73a6d913be Merge "Respect android:allowBackup="false" during full backup & restore" 2011-06-03 17:39:27 -07:00
John Wang
69d0d5ee2f am 0b1923ce: am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE 
* commit '0b1923ce512d278336aab0c780d439b655e29b1c':
  Add supplyPuk to do SIM puk unlock.
 2011-06-03 17:35:46 -07:00
Kazuhiro Ondo
e83d230f53 am 76273dd1: am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting" 
* commit '76273dd16d856f98de3f063a6c04caad2d374728':
  Data recovery failure due to apn/dc state stuck in "disconnecting"
 2011-06-03 17:34:08 -07:00
Daniel Sandler
f3fa75416b am 58f48edd: (-s ours) am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones. 
* commit '58f48edd21aa6f50886e68ef23d801027e96ec01':
  DO NOT MERGE. Restore status bar on phones.
 2011-06-03 17:33:45 -07:00
Roman Nurik
62a5e3e4d4 am e7d60078: Add old blog posts as articles, batch 1 
* commit 'e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
  Add old blog posts as articles, batch 1
 2011-06-03 17:27:03 -07:00
Jeff Brown
988f27055e resolved conflicts for merge of 955e8d79 to master 
Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18
 2011-06-03 17:24:05 -07:00
Jeff Brown
f165882176 Merge "Use pointer mode instead of spots for SEMI_MT touch pads." 2011-06-03 17:12:07 -07:00
Andy Stadler
47222c7889 am daac9dd9: (-s ours) am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2 
* commit 'daac9dd9742c3a1eaeee339c4d21e6f2dc758923':
  DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
 2011-06-03 16:35:21 -07:00
Wink Saville
55980c8fdc am 3699c3d7: am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE 
* commit '3699c3d7c8a450cc39fd1c3db23b64208bd43353':
  Refactor ServiceStateTracker handling of radio technology.
 2011-06-03 16:35:08 -07:00
Dianne Hackborn
2faa91fc11 am dddd6b15: am 185e3e24: Fix when managed cursors are required. 
* commit 'dddd6b15d5274a6138facec9f553336fac5f6de6':
  Fix when managed cursors are required.
 2011-06-03 16:27:36 -07:00
Dianne Hackborn
7b68400e7c am 185e3e24: Fix when managed cursors are required. 
* commit '185e3e243ee1da136bcace854026b8abaf0c4c86':
  Fix when managed cursors are required.
 2011-06-03 16:23:15 -07:00
satok
66c26b772a am 75273707: (-s ours) am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java 
* commit '752737076dd0424998b8399e82af00bf745ba22f':
  (Do not merge) Backport a fix for InputMethodManager.java
 2011-06-03 16:22:04 -07:00