OSDN Git Service
Fabrice Di Meglio [Mon, 6 Jun 2011 21:14:36 +0000 (14:14 -0700)]
Merge "Fix USE_TEXT_LAYOUT_CACHE define"
Martijn Coenen [Mon, 6 Jun 2011 20:46:47 +0000 (13:46 -0700)]
Merge "Connecting to a NFC technology may fail."
Jeff Brown [Mon, 6 Jun 2011 20:14:13 +0000 (13:14 -0700)]
Merge "Copy pointer assets for hdpi."
Nick Pelly [Mon, 6 Jun 2011 19:57:32 +0000 (12:57 -0700)]
am
92279c0f: Merge branch \'honeycomb-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
* commit '
92279c0fa1c15bd4afaf051bed90776fa64744c1':
TK MUN [Mon, 6 Jun 2011 19:57:24 +0000 (12:57 -0700)]
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
Eric Fischer [Mon, 6 Jun 2011 19:57:14 +0000 (12:57 -0700)]
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
Jaikumar Ganesh [Mon, 6 Jun 2011 19:56:55 +0000 (12:56 -0700)]
am
5aaed097: am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
5aaed0970be451479a07b2423e709026dec6611b':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 19:56:29 +0000 (12:56 -0700)]
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.
Marco Nelissen [Mon, 6 Jun 2011 19:33:40 +0000 (12:33 -0700)]
Merge "resolved conflicts for merge of
b2fd84ad to master"
Marco Nelissen [Mon, 6 Jun 2011 19:30:40 +0000 (12:30 -0700)]
resolved conflicts for merge of
b2fd84ad to master
Change-Id: I36b8dba94386981e95abbb0ac8db5e84cce56fb9
Nick Pelly [Mon, 6 Jun 2011 18:52:21 +0000 (11:52 -0700)]
Merge branch 'honeycomb-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into honeycomb-plus-aosp
TK MUN [Mon, 6 Jun 2011 18:51:22 +0000 (11:51 -0700)]
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
Eric Fischer [Mon, 6 Jun 2011 18:50:16 +0000 (11:50 -0700)]
am
e9d32283: am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
e9d32283e4eca1ee27218ed66f754a694678ac6d':
Import revised translations. DO NOT MERGE
RoboErik [Mon, 6 Jun 2011 18:39:40 +0000 (11:39 -0700)]
Merge "Cleanup of Calendar.java to prep for api"
Jaikumar Ganesh [Mon, 6 Jun 2011 18:34:11 +0000 (11:34 -0700)]
am
58ada2f3: am
94062517: Merge "Require bonding and encryption for PBAP server"
* commit '
58ada2f3bbab749fb5a813fb8f82eee347080405':
Require bonding and encryption for PBAP server
Jean-Baptiste Queru [Mon, 6 Jun 2011 18:33:52 +0000 (11:33 -0700)]
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.
Eric Fischer [Mon, 6 Jun 2011 17:54:41 +0000 (10:54 -0700)]
am
b16b020d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '
b16b020dd32147fbaaf7de47d5de16bfee10967a':
Import revised translations. DO NOT MERGE
Alex Sakhartchouk [Mon, 6 Jun 2011 17:54:26 +0000 (10:54 -0700)]
Merge "Unhiding render target code for renderscript"
Eric Fischer [Mon, 6 Jun 2011 17:38:42 +0000 (10:38 -0700)]
Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
Marco Nelissen [Mon, 6 Jun 2011 16:55:15 +0000 (09:55 -0700)]
resolved conflicts for merge of
b9783b49 to honeycomb-plus-aosp
Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
John Reck [Mon, 6 Jun 2011 16:25:44 +0000 (09:25 -0700)]
Merge "Delay set picture if necessary"
Glenn Kasten [Mon, 6 Jun 2011 16:12:05 +0000 (09:12 -0700)]
Merge "Remove dead code related to gettid"
Marco Nelissen [Mon, 6 Jun 2011 15:21:07 +0000 (08:21 -0700)]
Merge "Add WebP Mime-Type support in Android Media File"
Shih-wei Liao [Sun, 5 Jun 2011 07:58:40 +0000 (00:58 -0700)]
Merge "Fix the false-alarm bug when we skip to the end, which should be OK."
Wink Saville [Sat, 4 Jun 2011 15:19:00 +0000 (08:19 -0700)]
Merge "resolved conflict for merge of
fc51aaec to master"
Daniel Sandler [Sat, 4 Jun 2011 14:38:08 +0000 (07:38 -0700)]
Merge "Fix the status bar test app."
Wink Saville [Sat, 4 Jun 2011 14:31:35 +0000 (07:31 -0700)]
resolved conflict for merge of
fc51aaec to master
Change-Id: Iee4d9ecc946dd1bbf114a70ad32db0fe47a027df
Wink Saville [Sat, 4 Jun 2011 13:24:40 +0000 (06:24 -0700)]
am
6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
* commit '
6ff5ba00b07b32f3c82bce2c412e5e8f30c202bc':
Add FileUtils.checksumCrc32
Wink Saville [Sat, 4 Jun 2011 13:15:21 +0000 (06:15 -0700)]
Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
Romain Guy [Sat, 4 Jun 2011 01:52:41 +0000 (18:52 -0700)]
Merge "Measure text with the appropriate text encoding. Bug #
4546327"
Dianne Hackborn [Sat, 4 Jun 2011 01:02:10 +0000 (18:02 -0700)]
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.
Roman Nurik [Sat, 4 Jun 2011 01:02:01 +0000 (18:02 -0700)]
am
16475a3a: am
07613835: am
e7d60078: Add old blog posts as articles, batch 1
* commit '
16475a3a40beac982886ce6bc300f4ffe29f581d':
Add old blog posts as articles, batch 1
Dianne Hackborn [Sat, 4 Jun 2011 01:01:57 +0000 (18:01 -0700)]
am
e826feb6: am
dddd6b15: am
185e3e24: Fix when managed cursors are required.
* commit '
e826feb66c2a3690716136c24926606eafe827dc':
Fix when managed cursors are required.
Robert Greenwalt [Sat, 4 Jun 2011 01:01:46 +0000 (18:01 -0700)]
am
89c1eb8e: am
80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
* commit '
89c1eb8edcf2920b4f72e2ca63817a901e2340d7':
Promote Telephony's isDataPossible.
Dianne Hackborn [Sat, 4 Jun 2011 00:57:33 +0000 (17:57 -0700)]
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.
Dianne Hackborn [Sat, 4 Jun 2011 00:54:28 +0000 (17:54 -0700)]
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.
Dianne Hackborn [Sat, 4 Jun 2011 00:52:23 +0000 (17:52 -0700)]
Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
James Dong [Sat, 4 Jun 2011 00:43:20 +0000 (17:43 -0700)]
Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"
James Dong [Sat, 4 Jun 2011 00:42:31 +0000 (17:42 -0700)]
Merge "Initial-checkin for ON2 Software AVC/H264 decoder"
Roman Nurik [Sat, 4 Jun 2011 00:40:11 +0000 (17:40 -0700)]
am
07613835: am
e7d60078: Add old blog posts as articles, batch 1
* commit '
076138357027189f1bb90caf8c2e1a09497d78ac':
Add old blog posts as articles, batch 1
Christopher Tate [Sat, 4 Jun 2011 00:39:27 +0000 (17:39 -0700)]
Merge "Respect android:allowBackup="false" during full backup & restore"
John Wang [Sat, 4 Jun 2011 00:35:46 +0000 (17:35 -0700)]
am
0b1923ce: am
3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
* commit '
0b1923ce512d278336aab0c780d439b655e29b1c':
Add supplyPuk to do SIM puk unlock.
Kazuhiro Ondo [Sat, 4 Jun 2011 00:34:08 +0000 (17:34 -0700)]
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"
Daniel Sandler [Sat, 4 Jun 2011 00:33:45 +0000 (17:33 -0700)]
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.
Roman Nurik [Sat, 4 Jun 2011 00:27:03 +0000 (17:27 -0700)]
am
e7d60078: Add old blog posts as articles, batch 1
* commit '
e7d6007872af7f27b62bfb46aadf2b7a07c0eac0':
Add old blog posts as articles, batch 1
Jeff Brown [Sat, 4 Jun 2011 00:24:05 +0000 (17:24 -0700)]
resolved conflicts for merge of
955e8d79 to master
Change-Id: I90b0d523053d173b7df60ebc975de65ab387ff18
Jeff Brown [Sat, 4 Jun 2011 00:12:07 +0000 (17:12 -0700)]
Merge "Use pointer mode instead of spots for SEMI_MT touch pads."
Andy Stadler [Fri, 3 Jun 2011 23:35:21 +0000 (16:35 -0700)]
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()
Wink Saville [Fri, 3 Jun 2011 23:35:08 +0000 (16:35 -0700)]
am
3699c3d7: am
5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
* commit '
3699c3d7c8a450cc39fd1c3db23b64208bd43353':
Refactor ServiceStateTracker handling of radio technology.
Dianne Hackborn [Fri, 3 Jun 2011 23:27:36 +0000 (16:27 -0700)]
am
dddd6b15: am
185e3e24: Fix when managed cursors are required.
* commit '
dddd6b15d5274a6138facec9f553336fac5f6de6':
Fix when managed cursors are required.
Dianne Hackborn [Fri, 3 Jun 2011 23:23:15 +0000 (16:23 -0700)]
am
185e3e24: Fix when managed cursors are required.
* commit '
185e3e243ee1da136bcace854026b8abaf0c4c86':
Fix when managed cursors are required.
satok [Fri, 3 Jun 2011 23:22:04 +0000 (16:22 -0700)]
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
Dianne Hackborn [Fri, 3 Jun 2011 23:16:55 +0000 (16:16 -0700)]
resolved conflicts for merge of
d247ee41 to master
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
Wink Saville [Fri, 3 Jun 2011 22:55:25 +0000 (15:55 -0700)]
am
14751014: am
2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
* commit '
147510145f7b619f86a71065f2d62f444aee7f3d':
CdmaLte: Use SPN from SIM card if SIM card is presend
Wink Saville [Fri, 3 Jun 2011 22:55:20 +0000 (15:55 -0700)]
am
ade2a546: am
1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
* commit '
ade2a5467c8f6fbb115df6a1e5730758db4e620c':
Read CSIM records in LTE on CDMA mode
Jeff Brown [Fri, 3 Jun 2011 22:51:56 +0000 (15:51 -0700)]
Merge "resolved conflicts for merge of
ca2b552d to master"
Jeff Brown [Fri, 3 Jun 2011 22:50:27 +0000 (15:50 -0700)]
resolved conflicts for merge of
ca2b552d to master
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
John Reck [Fri, 3 Jun 2011 22:46:35 +0000 (15:46 -0700)]
Merge "Prevent WebKit updates in loadViewState case"
Robert Greenwalt [Fri, 3 Jun 2011 22:46:08 +0000 (15:46 -0700)]
am
80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
* commit '
80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
Robert Greenwalt [Fri, 3 Jun 2011 22:42:48 +0000 (15:42 -0700)]
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
Jeff Brown [Fri, 3 Jun 2011 22:30:33 +0000 (15:30 -0700)]
am
56503b8d: am
8186a5f0: am
10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
* commit '
56503b8ddfe5c82407da32e18061e725f668432d':
Implement pointer acceleration.
Scott Main [Fri, 3 Jun 2011 22:29:17 +0000 (15:29 -0700)]
am
b9040e77: am
5b8342cf: am
a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
* commit '
b9040e774920c4641c154df2a358100cf78a2bd3':
cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info
Scott Main [Fri, 3 Jun 2011 22:29:01 +0000 (15:29 -0700)]
am
59a3ad16: am
d5335253: am
b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
* commit '
59a3ad16f57d23eb692b29bf7822dd5011dd7cc5':
cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11
Scott Main [Fri, 3 Jun 2011 22:28:44 +0000 (15:28 -0700)]
am
7c8b81c5: am
b04ac7ac: am
0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
* commit '
7c8b81c53674ffbd3fc0cdf29f5fff4548fda085':
Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links
Dianne Hackborn [Fri, 3 Jun 2011 22:24:20 +0000 (15:24 -0700)]
Merge "resolved conflicts for merge of
cc20b4e3 to master"
John Reck [Fri, 3 Jun 2011 22:21:16 +0000 (15:21 -0700)]
Merge "Initial support for view state serialization"
Dianne Hackborn [Fri, 3 Jun 2011 22:01:49 +0000 (15:01 -0700)]
resolved conflicts for merge of
cc20b4e3 to master
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
Scott Main [Fri, 3 Jun 2011 21:43:31 +0000 (14:43 -0700)]
am
5c6e95a7: am
ce214df9: am
f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '
5c6e95a77359bd6f758164b7f5a5a92093c2498f':
doc typo
Dianne Hackborn [Fri, 3 Jun 2011 21:43:18 +0000 (14:43 -0700)]
am
3a80c504: am
8b9a2b6c: am
e6676351: Work around OpenFeint bug.
* commit '
3a80c50485809fe72d6de83dacad494c5e84ed24':
Work around OpenFeint bug.
Fabrice Di Meglio [Fri, 3 Jun 2011 21:37:23 +0000 (14:37 -0700)]
Merge "Fix default TextView gravity"
Adam Powell [Fri, 3 Jun 2011 21:28:26 +0000 (14:28 -0700)]
am
b30dda6b: am
036c40f4: am
fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
* commit '
b30dda6b550fedcf5c3b15671d483205a7757e1b':
Framework: bugfix for menu selector not showing up properly.
Dianne Hackborn [Fri, 3 Jun 2011 21:28:18 +0000 (14:28 -0700)]
am
c11f6c3e: am
7cae137e: am
79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
* commit '
c11f6c3e33c9f1e3964cb2427f82509fc97e3527':
Compatibility mode never needed for normal size screens.
Dianne Hackborn [Fri, 3 Jun 2011 21:15:10 +0000 (14:15 -0700)]
resolved conflicts for merge of
b9e2f68b to master
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
John Wang [Fri, 3 Jun 2011 21:09:13 +0000 (14:09 -0700)]
am
3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
* commit '
3b71239aca01fb029d9acd2c606b7be9b8f32d66':
Add supplyPuk to do SIM puk unlock.
Adam Powell [Fri, 3 Jun 2011 21:03:20 +0000 (14:03 -0700)]
am
d19fbe34: am
ca234a07: am
8656ba12: Merge "Fix bug
4501658 - adjust toast frame padding" into honeycomb-mr2
* commit '
d19fbe34e33fa79121e2822d0063f3aec350b3e5':
Fix bug
4501658 - adjust toast frame padding
Scott Main [Fri, 3 Jun 2011 21:03:12 +0000 (14:03 -0700)]
am
1dd5fba9: (-s ours) am
2b876a31: am
f5992953: docs: fix typos
* commit '
1dd5fba94927119133dd56d41714c1a5f3b82611':
docs: fix typos
John Wang [Fri, 3 Jun 2011 21:01:59 +0000 (14:01 -0700)]
Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
Robert Greenwalt [Fri, 3 Jun 2011 20:58:47 +0000 (13:58 -0700)]
am
903cd57f: am
ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
* commit '
903cd57f67fee8708cc6349ca1aac4de01831798':
Remove redundent getCurrentCdmaDataConnectionState
Philip Milne [Fri, 3 Jun 2011 20:46:34 +0000 (13:46 -0700)]
Merge "Response to code review for GridLayout:"
Jim Miller [Fri, 3 Jun 2011 20:32:34 +0000 (13:32 -0700)]
Merge "Fix
4368649: Fix visible password issue on password unlock screen"
Dianne Hackborn [Fri, 3 Jun 2011 20:17:45 +0000 (13:17 -0700)]
am
c691d7f9: am
b8d10931: am
fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit '
c691d7f9a3621d5ef9b9d48e95c644a318b36322':
Forgot this file.
Dianne Hackborn [Fri, 3 Jun 2011 20:17:00 +0000 (13:17 -0700)]
am
7322e557: am
a4cfcf10: am
75d6b3c2: Merge "Fix issue #
4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
* commit '
7322e557cfe42da42779625d69ced2db74a9df90':
Fix issue #
4502672: Wrong xml resources used for homescreen widgets.
Joe Malin [Fri, 3 Jun 2011 20:16:29 +0000 (13:16 -0700)]
am
409db558: am
a3d68aed: am
d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit '
409db558b3f47ac28f1291d82bef15a07b2920c3':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
Dianne Hackborn [Fri, 3 Jun 2011 19:13:24 +0000 (12:13 -0700)]
resolved conflicts for merge of
7e193916 to master
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
Kazuhiro Ondo [Fri, 3 Jun 2011 19:19:23 +0000 (12:19 -0700)]
am
77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
* commit '
77c9411306b6b3d210d22214d596272c9728cf5e':
Data recovery failure due to apn/dc state stuck in "disconnecting"
Daniel Sandler [Fri, 3 Jun 2011 18:26:17 +0000 (11:26 -0700)]
am
f5699b82: am
b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit '
f5699b82adef34b0b6bd88554c6a017f8662985e':
DO NOT MERGE. Restore status bar on phones.
Daniel Sandler [Fri, 3 Jun 2011 18:22:49 +0000 (11:22 -0700)]
am
b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit '
b4b44bd32983e154f2ad61b99809ed6cedd46d47':
DO NOT MERGE. Restore status bar on phones.
Jeff Brown [Fri, 3 Jun 2011 18:21:42 +0000 (11:21 -0700)]
am
f257c4b5: (-s ours) am
1311455f: am
d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
* commit '
f257c4b575ad1bda77decfc2ecb5df234762247e':
Button state should reflect actual buttons. (DO NOT MERGE)
Amith Yamasani [Fri, 3 Jun 2011 18:11:22 +0000 (11:11 -0700)]
am
42f53c7e: am
eb012034: am
0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
* commit '
42f53c7e6cec8d17a850a550c74f8dfc9435fbf7':
Use Holo background and proper padding for App Permissions UI.
Stephen Hines [Fri, 3 Jun 2011 17:41:08 +0000 (10:41 -0700)]
Merge "Improve validation in RS FieldPacker."
Gilles Debunne [Fri, 3 Jun 2011 17:35:58 +0000 (10:35 -0700)]
am
00afa11c: am
0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
* commit '
00afa11c1565da7ad6721db08a4da7c2ec1eacc0':
Tap timeout removed on paste. Relying on position only.
Andy Stadler [Fri, 3 Jun 2011 17:33:13 +0000 (10:33 -0700)]
am
c22d145a: am
3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '
c22d145a9f26314e23ea678e96766755268e878b':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
Gilles Debunne [Fri, 3 Jun 2011 17:32:00 +0000 (10:32 -0700)]
am
0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
* commit '
0538e6217de35e418c9779fd48c8300e65cc4f1e':
Tap timeout removed on paste. Relying on position only.
Andy Stadler [Fri, 3 Jun 2011 17:28:45 +0000 (10:28 -0700)]
am
3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
* commit '
3148557c42aaa8abf4001dc6fd759e911ba55280':
DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()
Gilles Debunne [Fri, 3 Jun 2011 17:26:18 +0000 (10:26 -0700)]
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
Andy Stadler [Fri, 3 Jun 2011 17:24:27 +0000 (10:24 -0700)]
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
Eric Fischer [Fri, 3 Jun 2011 17:22:58 +0000 (10:22 -0700)]
Merge "Import revised translations."
Wink Saville [Fri, 3 Jun 2011 17:21:07 +0000 (10:21 -0700)]
am
5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
* commit '
5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
Wink Saville [Fri, 3 Jun 2011 17:16:11 +0000 (10:16 -0700)]
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
Daniel Sandler [Fri, 3 Jun 2011 15:10:03 +0000 (08:10 -0700)]
Merge "Restore status bar on phones."
OSDN Git Service
