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 |
|
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 |
|
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 |
|
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 |
|
Adam Powell
|
4df6fa435e
|
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.
|
2011-06-03 14:28:26 -07:00 |
|
Dianne Hackborn
|
1a4db9cb31
|
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.
|
2011-06-03 14:28:18 -07:00 |
|
Dianne Hackborn
|
491e7b4bdf
|
resolved conflicts for merge of b9e2f68b to master
Change-Id: Icb68aee4c68170f0e7cd7854dbaa61656a349142
|
2011-06-03 14:15:10 -07:00 |
|
Adam Powell
|
5719bdf635
|
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
|
2011-06-03 14:03:20 -07:00 |
|
Scott Main
|
58f8c28076
|
am 1dd5fba9: (-s ours) am 2b876a31: am f5992953: docs: fix typos
* commit '1dd5fba94927119133dd56d41714c1a5f3b82611':
docs: fix typos
|
2011-06-03 14:03:12 -07:00 |
|
Robert Greenwalt
|
f23f35399c
|
am 903cd57f: am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
* commit '903cd57f67fee8708cc6349ca1aac4de01831798':
Remove redundent getCurrentCdmaDataConnectionState
|
2011-06-03 13:58:47 -07:00 |
|
Philip Milne
|
c440d93f4d
|
Merge "Response to code review for GridLayout:"
|
2011-06-03 13:46:34 -07:00 |
|
Jim Miller
|
942d9ce724
|
Merge "Fix 4368649: Fix visible password issue on password unlock screen"
|
2011-06-03 13:32:34 -07:00 |
|
Dianne Hackborn
|
cd3471ab08
|
am c691d7f9: am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
* commit 'c691d7f9a3621d5ef9b9d48e95c644a318b36322':
Forgot this file.
|
2011-06-03 13:17:45 -07:00 |
|
Dianne Hackborn
|
fda22a1f87
|
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.
|
2011-06-03 13:17:00 -07:00 |
|
Joe Malin
|
5f8f246b90
|
am 409db558: am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
* commit '409db558b3f47ac28f1291d82bef15a07b2920c3':
Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
|
2011-06-03 13:16:29 -07:00 |
|
Dianne Hackborn
|
6251456d6a
|
resolved conflicts for merge of 7e193916 to master
Change-Id: If06892419319c3a2d4ab6b03dd3ceb99b83803b5
|
2011-06-03 12:26:54 -07:00 |
|
Daniel Sandler
|
5dbf6527c4
|
am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit 'f5699b82adef34b0b6bd88554c6a017f8662985e':
DO NOT MERGE. Restore status bar on phones.
|
2011-06-03 11:26:17 -07:00 |
|
Daniel Sandler
|
aac874a461
|
am b4b44bd3: DO NOT MERGE. Restore status bar on phones.
* commit 'b4b44bd32983e154f2ad61b99809ed6cedd46d47':
DO NOT MERGE. Restore status bar on phones.
|
2011-06-03 11:22:49 -07:00 |
|
Jeff Brown
|
6ae6526121
|
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)
|
2011-06-03 11:21:42 -07:00 |
|
Amith Yamasani
|
0c18be5a19
|
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.
|
2011-06-03 11:11:22 -07:00 |
|
Stephen Hines
|
b917c18c28
|
Merge "Improve validation in RS FieldPacker."
|
2011-06-03 10:41:08 -07:00 |
|
Gilles Debunne
|
3208f76592
|
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.
|
2011-06-03 10:35:58 -07:00 |
|
Andy Stadler
|
7ac3f736f4
|
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()
|
2011-06-03 10:33:13 -07:00 |
|
Gilles Debunne
|
9467440179
|
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.
|
2011-06-03 10:32:00 -07:00 |
|
Andy Stadler
|
d163899fa6
|
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()
|
2011-06-03 10:28:45 -07:00 |
|
Gilles Debunne
|
b8c3181422
|
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
|
2011-06-03 10:26:18 -07:00 |
|
Andy Stadler
|
4d68ae93e2
|
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
|
2011-06-03 10:24:27 -07:00 |
|
Eric Fischer
|
e9360e9e46
|
Merge "Import revised translations."
|
2011-06-03 10:22:58 -07:00 |
|
Wink Saville
|
e73d276f8b
|
am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
* commit '5b4e24400a4f1a6c67efd08ab2cda3389f78144e':
Refactor ServiceStateTracker handling of radio technology.
|
2011-06-03 10:21:07 -07:00 |
|
Wink Saville
|
ffc24f1b5b
|
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
|
2011-06-03 10:16:11 -07:00 |
|
Daniel Sandler
|
a407c07ca5
|
Merge "Restore status bar on phones."
|
2011-06-03 08:10:03 -07:00 |
|
Derek Sollenberger
|
75b13fb030
|
Merge "Add API to allow plugins to lock their orientation in full-screen mode."
|
2011-06-03 05:50:16 -07:00 |
|