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 |
|
Dianne Hackborn
|
4f5b1f5511
|
resolved conflicts for merge of d247ee41 to master
Change-Id: I49bd932f5019ce0608e2661d5cb7f24b6122dcba
|
2011-06-03 16:16:55 -07:00 |
|
Wink Saville
|
51a2ab51bd
|
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
|
2011-06-03 15:55:25 -07:00 |
|
Wink Saville
|
8b28f490f8
|
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
|
2011-06-03 15:55:20 -07:00 |
|
Jeff Brown
|
43c37acece
|
Merge "resolved conflicts for merge of ca2b552d to master"
|
2011-06-03 15:51:56 -07:00 |
|
Jeff Brown
|
bcc45f952b
|
resolved conflicts for merge of ca2b552d to master
Change-Id: I2f3693a59042ac5aa2d7bcdc3a504c78dc99a18b
|
2011-06-03 15:50:27 -07:00 |
|
John Reck
|
cc0fd37820
|
Merge "Prevent WebKit updates in loadViewState case"
|
2011-06-03 15:46:35 -07:00 |
|
Robert Greenwalt
|
6925d63771
|
am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
* commit '80a19e67d1cd3710dbbfa52767a994512d20f694':
Promote Telephony's isDataPossible.
|
2011-06-03 15:46:08 -07:00 |
|
Robert Greenwalt
|
c1fdb11b74
|
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
|
2011-06-03 15:42:48 -07:00 |
|
Jeff Brown
|
36f49c133e
|
am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
* commit '56503b8ddfe5c82407da32e18061e725f668432d':
Implement pointer acceleration.
|
2011-06-03 15:30:33 -07:00 |
|
Scott Main
|
5550bce7e9
|
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
|
2011-06-03 15:29:17 -07:00 |
|
Scott Main
|
b17ba60b84
|
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
|
2011-06-03 15:29:01 -07:00 |
|
Scott Main
|
b5c93e4efe
|
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
|
2011-06-03 15:28:44 -07:00 |
|
Dianne Hackborn
|
493e287120
|
Merge "resolved conflicts for merge of cc20b4e3 to master"
|
2011-06-03 15:24:20 -07:00 |
|
John Reck
|
9ec1a985ef
|
Merge "Initial support for view state serialization"
|
2011-06-03 15:21:16 -07:00 |
|
Dianne Hackborn
|
738f04edca
|
resolved conflicts for merge of cc20b4e3 to master
Change-Id: I990368443a16a0577f7a1f5623b348cca3f81ac4
|
2011-06-03 15:01:49 -07:00 |
|
Scott Main
|
9a73483248
|
am 5c6e95a7: am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
* commit '5c6e95a77359bd6f758164b7f5a5a92093c2498f':
doc typo
|
2011-06-03 14:43:31 -07:00 |
|
Dianne Hackborn
|
60bb5dea2b
|
am 3a80c504: am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
* commit '3a80c50485809fe72d6de83dacad494c5e84ed24':
Work around OpenFeint bug.
|
2011-06-03 14:43:18 -07:00 |
|
Fabrice Di Meglio
|
469095ade8
|
Merge "Fix default TextView gravity"
|
2011-06-03 14:37:23 -07:00 |
|