Gitiles
Code Review
Sign In
review.blissroms.org
/
platform_frameworks_native
/
0129f1a27f13e175c9055e6f169096e5ac40602d
0129f1a
resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp
by Marco Nelissen
· 14 years ago
58ac798
am 6ff5ba00: Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
by Wink Saville
· 14 years ago
a3bd4c0
Merge "Add FileUtils.checksumCrc32" into honeycomb-LTE
by Wink Saville
· 14 years ago
d7ee0a0
am b4815f47: am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
4d3177d
am bd754205: Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
77a171c
Merge "Fix to not lose state when saving a deactivated fragment." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
9170daa
am 07613835: am e7d60078: Add old blog posts as articles, batch 1
by Roman Nurik
· 14 years ago
62a5e3e
am e7d60078: Add old blog posts as articles, batch 1
by Roman Nurik
· 14 years ago
2faa91f
am dddd6b15: am 185e3e24: Fix when managed cursors are required.
by Dianne Hackborn
· 14 years ago
7b68400
am 185e3e24: Fix when managed cursors are required.
by Dianne Hackborn
· 14 years ago
6925d63
am 80a19e67: Merge "Promote Telephony\'s isDataPossible." into honeycomb-LTE
by Robert Greenwalt
· 14 years ago
c1fdb11
Merge "Promote Telephony's isDataPossible." into honeycomb-LTE
by Robert Greenwalt
· 14 years ago
bff2a70
am 3b71239a: Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
by John Wang
· 14 years ago
34fef43
Merge "Add supplyPuk to do SIM puk unlock." into honeycomb-LTE
by John Wang
· 14 years ago
02d3ec8
am 77c94113: Data recovery failure due to apn/dc state stuck in "disconnecting"
by Kazuhiro Ondo
· 14 years ago
5dbf652
am f5699b82: am b4b44bd3: DO NOT MERGE. Restore status bar on phones.
by Daniel Sandler
· 14 years ago
aac874a
am b4b44bd3: DO NOT MERGE. Restore status bar on phones.
by Daniel Sandler
· 14 years ago
3208f76
am 00afa11c: am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
by Gilles Debunne
· 14 years ago
7ac3f73
am c22d145a: am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
by Andy Stadler
· 14 years ago
9467440
am 0538e621: Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
by Gilles Debunne
· 14 years ago
d163899
am 3148557c: Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
by Andy Stadler
· 14 years ago
b8c3181
Merge "Tap timeout removed on paste. Relying on position only." into honeycomb-mr2
by Gilles Debunne
· 14 years ago
4d68ae9
Merge "DO NOT MERGE Use unchecked admin lookup for getStorageEncryption()" into honeycomb-mr2
by Andy Stadler
· 14 years ago
e73d276
am 5b4e2440: Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
by Wink Saville
· 14 years ago
ffc24f1
Merge "Refactor ServiceStateTracker handling of radio technology." into honeycomb-LTE
by Wink Saville
· 14 years ago
d01595f
am e10de072: am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
by satok
· 14 years ago
63dc067
am be96408b: (Do not merge) Backport a fix for InputMethodManager.java
by satok
· 14 years ago
b84e4b1
am 758b67b1: am b46ed763: Add new Fragment API for explicitly saving/restoring state.
by Dianne Hackborn
· 14 years ago
8453c5f
am b46ed763: Add new Fragment API for explicitly saving/restoring state.
by Dianne Hackborn
· 14 years ago
22ff9d8
am 2e543dc1: Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
by Wink Saville
· 14 years ago
30fa58f
am 1076f5ff: Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
by Wink Saville
· 14 years ago
bc69a26
Merge "CdmaLte: Use SPN from SIM card if SIM card is presend" into honeycomb-LTE
by Wink Saville
· 14 years ago
7f1e2d7
Merge "Read CSIM records in LTE on CDMA mode" into honeycomb-LTE
by Wink Saville
· 14 years ago
825d9b7
am c8812761: am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
by Jeff Brown
· 14 years ago
576768c
am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
af155f0
am e1718de6: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
by Jeff Brown
· 14 years ago
ee6acac
am 10c3f367: Merge "Implement pointer acceleration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
c51a9f8
Merge "Add a preference panel for mouse speed." into honeycomb-mr2
by Jeff Brown
· 14 years ago
2127c74
Merge "Implement pointer acceleration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
adab620
Implement pointer acceleration.
by Jeff Brown
· 14 years ago
752bc2f
am 5b8342cf: am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
by Scott Main
· 14 years ago
1db14c0
am d5335253: am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
by Scott Main
· 14 years ago
1d9bfbd
am b04ac7ac: am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
by Scott Main
· 14 years ago
dc26da8
am a8629089: Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add \'animator\' resource info" into honeycomb-mr2
by Scott Main
· 14 years ago
46b600d
am b8236751: Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
by Scott Main
· 14 years ago
04e9662
am 0d5ed597: Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
by Scott Main
· 14 years ago
7d0972e
Merge "cherrypick Change-Id: I7a3612a1bc22cf53d382f787fa43fe222978d35e docs: add 'animator' resource info" into honeycomb-mr2
by Scott Main
· 14 years ago
f95a59b
Merge "cherry pick Change-Id: Id082021be2c27476f106285d0dd68d9e0f5bb514 docs: release notes for adt 11" into honeycomb-mr2
by Scott Main
· 14 years ago
cac9b2c
Merge "Cherry pick Change-Id: Ie9d68854926544749dde4edfeac9be2ece38560b docs: fix broken links" into honeycomb-mr2
by Scott Main
· 14 years ago
dde2aa2
am a5f88510: am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
0c5ffe9
am 2969b511: Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
da86002
Merge "Add new supports-screen API to set maximum allowed size." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
57416d8
am ce214df9: am f58e6c98: Merge "doc typo" into honeycomb-mr2
by Scott Main
· 14 years ago
476e004
am 8b9a2b6c: am e6676351: Work around OpenFeint bug.
by Dianne Hackborn
· 14 years ago
5acfb5f
am f58e6c98: Merge "doc typo" into honeycomb-mr2
by Scott Main
· 14 years ago
f81450c
am e6676351: Work around OpenFeint bug.
by Dianne Hackborn
· 14 years ago
a76b2cd
Merge "doc typo" into honeycomb-mr2
by Scott Main
· 14 years ago
eca8e2d
am 036c40f4: am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
by Adam Powell
· 14 years ago
663fd59
am 7cae137e: am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
d6a6bb6
am fa8ee177: Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
by Adam Powell
· 14 years ago
c3bab1a
Merge "Framework: bugfix for menu selector not showing up properly." into honeycomb-mr2
by Adam Powell
· 14 years ago
2083dd1
am 79841acb: Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
9e19c9e
Merge "Compatibility mode never needed for normal size screens." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
af2c339
am 13e2bef4: am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
e593915
am 80cf4e79: Merge "Fix issue #4500511: Holo effect background doesn\'t reach top of screen anymore" into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
5717c26
Merge "Fix issue #4500511: Holo effect background doesn't reach top of screen anymore" into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
9018cf8
am ca234a07: am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
by Adam Powell
· 14 years ago
60888e4
am 8656ba12: Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
by Adam Powell
· 14 years ago
d27a23d
Merge "Fix bug 4501658 - adjust toast frame padding" into honeycomb-mr2
by Adam Powell
· 14 years ago
1e1f528
am 2b876a31: am f5992953: docs: fix typos
by Scott Main
· 14 years ago
794992b
am f5992953: docs: fix typos
by Scott Main
· 14 years ago
725c6e2
am ddae8936: Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
by Robert Greenwalt
· 14 years ago
d05f356
Merge "Remove redundent getCurrentCdmaDataConnectionState" into honeycomb-LTE
by Robert Greenwalt
· 14 years ago
ffd64a7
am b8d10931: am fd206560: Merge "Forgot this file." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
1c131d4
am fd206560: Merge "Forgot this file." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
5207046
Merge "Forgot this file." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
f02132f
am a4cfcf10: am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
7c51115
am 75d6b3c2: Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
13520e8
Merge "Fix issue #4502672: Wrong xml resources used for homescreen widgets." into honeycomb-mr2
by Dianne Hackborn
· 14 years ago
f3b29e4
am a3d68aed: am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
by Joe Malin
· 14 years ago
d44e27c
am d40a5d5c: Cherry pick honeycomb-mr1 I064d4dba to I48ddc26d4f
by Joe Malin
· 14 years ago
68eadf6
am 425f2a6d: am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
93600d9
am 1311455f: am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
by Jeff Brown
· 14 years ago
4c61cbe
am c272d427: Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
3576fc4
am d854304c: Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
by Jeff Brown
· 14 years ago
5eba89c
Merge "Use ViewConfiguration to seed input system configuration." into honeycomb-mr2
by Jeff Brown
· 14 years ago
e63c757
Merge "Button state should reflect actual buttons. (DO NOT MERGE)" into honeycomb-mr2
by Jeff Brown
· 14 years ago
774eb12
am eb012034: am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
by Amith Yamasani
· 14 years ago
459541b
am 0119a67e: Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
by Amith Yamasani
· 14 years ago
87d4848
Merge "Use Holo background and proper padding for App Permissions UI." into honeycomb-mr2
by Amith Yamasani
· 14 years ago
ebb08ea
am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
by Tadashi G. Takaoka
· 14 years ago
05650ef
am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
by Tadashi G. Takaoka
· 14 years ago
6204195
am 10b364b4: am 4cf0eee7: Merge "Fixing concurrency issue on IccPhoneBookInterfaceManager."
by Conley Owens
· 14 years ago
81434ee
am 228e4716: (-s ours) am 34f5991e: Merge 6103e22c from honeycomb-mr1. do not merge.
by Xavier Ducrohet
· 14 years ago
dc35d6e
am af83d4ec: (-s ours) am c7b87766: Merge 2402ad60 from honeycomb-mr1. do not merge.
by Xavier Ducrohet
· 14 years ago
eac9271
Merge "resolved conflicts for merge of a38fad37 to honeycomb-plus-aosp" into honeycomb-plus-aosp
by Ed Heyl
· 14 years ago
c7223cb
am 93b05690: am 5485ff61: Reduce the number of notification icons on narrow screens.
by satok
· 14 years ago
6b5ebe0
am 5485ff61: Reduce the number of notification icons on narrow screens.
by satok
· 14 years ago
7147799
am 57675037: Further fix for SIM detection.
by Kazuhiro Ondo
· 14 years ago
64dd0b0
am 8075fe48: am 78470718: Fix various places that were using the wrong display metrics.
by Dianne Hackborn
· 14 years ago
Next »