OSDN Git Service
Dianne Hackborn [Thu, 3 Nov 2011 05:35:21 +0000 (05:35 +0000)]
am
17bd9a22: Merge "More performance work:" into ics-mr1
* commit '
17bd9a22ec993fc9eba060950bc5cecd1e06ffb1':
More performance work:
Dianne Hackborn [Thu, 3 Nov 2011 05:31:19 +0000 (22:31 -0700)]
Merge "More performance work:" into ics-mr1
Eric Fischer [Thu, 3 Nov 2011 00:43:11 +0000 (00:43 +0000)]
am
c37f98ea: (-s ours) am
8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
c37f98eab3d6e63f71b1600ea0e4355c6503384b':
Import revised translations. DO NOT MERGE
Katie McCormick [Thu, 3 Nov 2011 00:43:09 +0000 (00:43 +0000)]
am
f2158d08: am
e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
* commit '
f2158d0820ca6c243fd807224c7e8ebb96cd8d2b':
Doc change: Update instructions to match ICS UI
Katie McCormick [Thu, 3 Nov 2011 00:43:08 +0000 (00:43 +0000)]
am
31a05f33: Doc change: Update instructions to match ICS UI
* commit '
31a05f336ac99ab4ecfb5e227aca40f8fc7140cb':
Doc change: Update instructions to match ICS UI
Eric Fischer [Thu, 3 Nov 2011 00:04:10 +0000 (00:04 +0000)]
am
8c49b81b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
8c49b81b5971c3fd254c4ecd862d1a32b1917edb':
Import revised translations. DO NOT MERGE
Katie McCormick [Thu, 3 Nov 2011 00:04:09 +0000 (00:04 +0000)]
am
e08be659: Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
* commit '
e08be659eba742d117d24f642a95ba65e13bd015':
Doc change: Update instructions to match ICS UI
Eric Fischer [Wed, 2 Nov 2011 23:17:03 +0000 (16:17 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Adam Powell [Wed, 2 Nov 2011 22:47:42 +0000 (22:47 +0000)]
am
b41d9f8a: Merge "Fix bug
5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
* commit '
b41d9f8a84a325241440b6e950dea6d240134823':
Fix bug
5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled
Adam Powell [Wed, 2 Nov 2011 22:44:31 +0000 (15:44 -0700)]
Merge "Fix bug
5557267 - [ViewPager] non-primary fragments unnecessary stopped if "defer start" is enabled" into ics-mr1
Katie McCormick [Wed, 2 Nov 2011 22:42:18 +0000 (15:42 -0700)]
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 21:42:49 +0000 (21:42 +0000)]
am
b419abca: am
7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit '
b419abcadad79cd908acfe51dc6e8902c16ff728':
Avoid duplicate dialogs leading to NPE
Irfan Sheriff [Wed, 2 Nov 2011 21:38:55 +0000 (21:38 +0000)]
am
7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
* commit '
7f00c22b7fa7b38b644585c0a3c6faadc5def94c':
Avoid duplicate dialogs leading to NPE
Irfan Sheriff [Wed, 2 Nov 2011 21:37:19 +0000 (14:37 -0700)]
Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0
Robert Greenwalt [Wed, 2 Nov 2011 21:32:26 +0000 (21:32 +0000)]
am
4a113251: am
451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '
4a113251078ad028d1a071ebf5562185275c7039':
Ignore errors when untethering
Robert Greenwalt [Wed, 2 Nov 2011 21:28:33 +0000 (21:28 +0000)]
am
451fa13e: Merge "Ignore errors when untethering" into ics-mr0
* commit '
451fa13e82ea1226895b41282fdb33bf9fea5d19':
Ignore errors when untethering
Robert Greenwalt [Wed, 2 Nov 2011 21:26:45 +0000 (14:26 -0700)]
Merge "Ignore errors when untethering" into ics-mr0
Eric Fischer [Wed, 2 Nov 2011 21:16:29 +0000 (14:16 -0700)]
Merge "Import revised translations."
Tor Norbye [Wed, 2 Nov 2011 19:48:25 +0000 (12:48 -0700)]
Merge "Set theme-tag in render log when failing to find style"
Scott Main [Wed, 2 Nov 2011 19:14:48 +0000 (19:14 +0000)]
Scott Main [Wed, 2 Nov 2011 19:10:21 +0000 (19:10 +0000)]
Svetoslav Ganov [Wed, 2 Nov 2011 18:55:44 +0000 (18:55 +0000)]
am
1997fe14: Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
* commit '
1997fe1482ecf1ca920c7729a1ad9df5340565f3':
Update KeyBoardView to reflect the interaction model in Latin IME
Svetoslav Ganov [Wed, 2 Nov 2011 18:51:58 +0000 (11:51 -0700)]
Merge "Update KeyBoardView to reflect the interaction model in Latin IME" into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:50:06 +0000 (18:50 +0000)]
am
779c1b85: Merge "Make the notification panel header opaque." into ics-mr1
* commit '
779c1b8507d939bd3bd6d3e758ded095d91bcd6f':
Make the notification panel header opaque.
Peter Ng [Wed, 2 Nov 2011 18:50:03 +0000 (18:50 +0000)]
am
c7dbfc64: Merge "making slide unlock on tablet have a larger radius" into ics-mr1
* commit '
c7dbfc640bcbc6a238068742aeaa76473e56037e':
making slide unlock on tablet have a larger radius
Amith Yamasani [Wed, 2 Nov 2011 18:47:51 +0000 (18:47 +0000)]
am
dab15d14: Merge "Don\'t expand the SearchView if already expanded." into ics-mr1
* commit '
dab15d14ca2ce9c3a614e97869824c6337e76d51':
Don't expand the SearchView if already expanded.
Peter Ng [Wed, 2 Nov 2011 18:47:04 +0000 (11:47 -0700)]
Merge "Make the notification panel header opaque." into ics-mr1
Peter Ng [Wed, 2 Nov 2011 18:46:32 +0000 (11:46 -0700)]
Merge "making slide unlock on tablet have a larger radius" into ics-mr1
Amith Yamasani [Wed, 2 Nov 2011 18:43:53 +0000 (11:43 -0700)]
Merge "Don't expand the SearchView if already expanded." into ics-mr1
The Android Open Source Project [Wed, 2 Nov 2011 17:59:05 +0000 (17:59 +0000)]
am
11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Adam Powell [Wed, 2 Nov 2011 17:54:36 +0000 (17:54 +0000)]
am
7a5a50c1: Merge "Bug
5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
* commit '
7a5a50c12f6a6e094d1e8aa7514df37f1176354a':
Bug
5513073 - IllegalArgumentException: View not attached to window manager
The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
Svetoslav Ganov [Wed, 2 Nov 2011 17:50:50 +0000 (17:50 +0000)]
am
e5d0f199: Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
* commit '
e5d0f19953189fdd0e2661ebb7f0ea925f14ea13':
CalendarView title incorrectly updated for different languages.
Svetoslav Ganov [Wed, 2 Nov 2011 17:50:48 +0000 (17:50 +0000)]
am
6e42470f: Merge "Accessibility window query APIs should respect root name space." into ics-mr1
* commit '
6e42470f928bbf60c9fd3d17a2a69a4b96cec170':
Accessibility window query APIs should respect root name space.
Svetoslav Ganov [Wed, 2 Nov 2011 17:50:46 +0000 (17:50 +0000)]
am
7f0c850b: Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
* commit '
7f0c850b7a4a2b8a135a110a33d053f4d6689559':
Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes.
Irfan Sheriff [Wed, 2 Nov 2011 17:50:27 +0000 (17:50 +0000)]
am
f9d8faf7: am
953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit '
f9d8faf7fe9d23bddf4d8d039805bce806e9b9c6':
Specify component name for provisioning
Jeff Sharkey [Wed, 2 Nov 2011 17:50:25 +0000 (17:50 +0000)]
am
9427d688: am
db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit '
9427d688bda2d5b177112a58dcfdbcdfdfe98559':
Process AMS events in NetworkPolicy handler.
Dianne Hackborn [Wed, 2 Nov 2011 17:50:23 +0000 (17:50 +0000)]
am
39cec406: Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
* commit '
39cec40697ab3d1d106e0c0c21458b2085c96f00':
Add new OOM adjustment for the "previous" process.
Fabrice Di Meglio [Wed, 2 Nov 2011 17:50:18 +0000 (17:50 +0000)]
am
07b4b314: am
bcf05a69: Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit '
07b4b3145333bc8ece9fdbb68ade726b3d6485cd':
Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
Dianne Hackborn [Wed, 2 Nov 2011 17:50:14 +0000 (17:50 +0000)]
am
ad41a94b: Merge "Some optimizations." into ics-mr1
* commit '
ad41a94b298f834e13632ee29b27cefd75f10012':
Some optimizations.
Adam Powell [Wed, 2 Nov 2011 17:50:12 +0000 (17:50 +0000)]
am
2eca6133: Merge "Fix bug
5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
* commit '
2eca6133b69db0a649b8429dcef4ed46b209bf41':
Fix bug
5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on
Katie McCormick [Wed, 2 Nov 2011 17:42:41 +0000 (17:42 +0000)]
am
46a10ee0: am
d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit '
46a10ee08d0e51c97923c8e3c54513d228b42467':
Doc Update: Update list of widget classes
Adam Powell [Wed, 2 Nov 2011 17:33:52 +0000 (10:33 -0700)]
Merge "Bug
5513073 - IllegalArgumentException: View not attached to window manager" into ics-mr1
Dima Zavin [Wed, 2 Nov 2011 17:31:47 +0000 (17:31 +0000)]
am
a9656df5: am
f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit '
a9656df58f75946f3eab4dd660df56c9d878a04e':
BatteryService(jni): properly handle read's return value
The Android Open Source Project [Wed, 2 Nov 2011 17:31:43 +0000 (17:31 +0000)]
am
a0d5bece: Reconcile with ics-mr0-release
* commit '
a0d5bece38f3b8fb430f3fb996e7baefb78d8602':
Mangesh Ghiware [Wed, 2 Nov 2011 17:31:38 +0000 (17:31 +0000)]
am
274133df: Merge "Fix setInitialScale() to take display density into account." into ics-mr1
* commit '
274133dfef84f93de349fcd34919f4df32279e8a':
Fix setInitialScale() to take display density into account.
Eric Fischer [Wed, 2 Nov 2011 17:31:35 +0000 (17:31 +0000)]
am
abf75396: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
abf7539642a7c3d8d31c1d12d705b54cf155db1a':
Import revised translations. DO NOT MERGE
Michael Jurka [Wed, 2 Nov 2011 17:31:33 +0000 (17:31 +0000)]
am
93430b3c: Merge "Fix: never show recents over lock screen" into ics-mr1
* commit '
93430b3c6d170bf1db538c21666e0b508e8e48ec':
Fix: never show recents over lock screen
Peter Ng [Wed, 2 Nov 2011 17:31:15 +0000 (17:31 +0000)]
am
80c3c87f: Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
* commit '
80c3c87ff08e77c3bcbd14f003e296bed9adba55':
Asset updates for tablet notifications and layout fixes to quicksettings
Fabrice Di Meglio [Wed, 2 Nov 2011 17:31:07 +0000 (17:31 +0000)]
am
3b8d33b1: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
* commit '
3b8d33b131956f3a1b41c15dbe07b1b2d7f44086':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Robert Greenwalt [Wed, 2 Nov 2011 17:31:06 +0000 (17:31 +0000)]
am
852d72b2: am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
852d72b28e6d7d0e6372a9b544641817338002e6':
Add cdma_rmnet4 to list of monitored interfaces
Daniel Sandler [Wed, 2 Nov 2011 17:30:42 +0000 (17:30 +0000)]
am
7775f52e: Merge "Bring timestamps back to notifications." into ics-mr1
* commit '
7775f52e4aa7703a5721378f5a1103d9486af895':
Bring timestamps back to notifications.
Jim Miller [Wed, 2 Nov 2011 17:30:40 +0000 (17:30 +0000)]
am
a67217c3: Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
* commit '
a67217c35ec43e06598b71feae63ce675fa9cac7':
Fix
5404916: Make layout fit on 480x800 hdpi device
Fabrice Di Meglio [Wed, 2 Nov 2011 17:30:39 +0000 (17:30 +0000)]
am
deb15704: (-s ours) am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
deb15704e9abcfc71bb81a358ff3bb239896474d':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Mangesh Ghiware [Wed, 2 Nov 2011 17:30:34 +0000 (17:30 +0000)]
am
00ef15b9: Merge "Clamp initial scale between minimum and maximum values." into ics-mr1
* commit '
00ef15b98ac0579ebd5f81a1753bc18384e88b8b':
Clamp initial scale between minimum and maximum values.
Adam Powell [Wed, 2 Nov 2011 17:30:29 +0000 (17:30 +0000)]
am
ca4100da: Merge "Fix bug
5534667 - Action bar icons need more space on tablet" into ics-mr1
* commit '
ca4100da0a0481b3b9f464bbc8842b571e8c60d5':
Fix bug
5534667 - Action bar icons need more space on tablet
Dianne Hackborn [Wed, 2 Nov 2011 17:30:26 +0000 (17:30 +0000)]
am
f136aa34: Merge "Various performance and other work." into ics-mr1
* commit '
f136aa341abaaf7fd6f7632d41a30b2989d93985':
Various performance and other work.
Peter Ng [Wed, 2 Nov 2011 17:30:25 +0000 (17:30 +0000)]
am
374e23bd: Merge "spinner focused states pumped up" into ics-mr1
* commit '
374e23bd11c42e7e472d2490a3dfddb7df198a66':
spinner focused states pumped up
The Android Open Source Project [Wed, 2 Nov 2011 17:30:20 +0000 (17:30 +0000)]
am
a0824452: am
9eb4c891: Reconcile with ics-factoryrom-2-release
* commit '
a0824452d5c511acc7d11396ff2e6423f7b03948':
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Philip Milne [Wed, 2 Nov 2011 17:30:11 +0000 (17:30 +0000)]
am
3617933b: Merge " Update to fix for bug
5393156" into ics-mr1
* commit '
3617933bee5a977a7e6c8f8f4b75e580f8bf2ebf':
Update to fix for bug
5393156
Jim Miller [Wed, 2 Nov 2011 17:29:49 +0000 (17:29 +0000)]
am
22726020: am
1dce37bd: Merge "Fix
5497305: Make sure we show SIM unlock when "None" is selected" into ics-mr0
* commit '
2272602032e5051d5067a7a95c741304468a81af':
Fix
5497305: Make sure we show SIM unlock when "None" is selected
Chih-Chung Chang [Wed, 2 Nov 2011 17:29:46 +0000 (17:29 +0000)]
am
11ba6da4: am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
satok [Wed, 2 Nov 2011 17:29:35 +0000 (17:29 +0000)]
am
ff93e417: Merge "Resolve memory leak in TextServicesManagerService" into ics-mr1
* commit '
ff93e417a217703a635d8601b835853e07233afd':
Resolve memory leak in TextServicesManagerService
Adam Powell [Wed, 2 Nov 2011 17:29:33 +0000 (17:29 +0000)]
am
b1db20bd: Merge "Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus" into ics-mr1
* commit '
b1db20bde5e00c8cdd1a97b07ddcc41f321d3db8':
Fix bug
5514022 - ListView should not auto-scroll selected item to top when gaining focus
Stephen Hines [Wed, 2 Nov 2011 17:29:30 +0000 (17:29 +0000)]
am
af3a854b: am
af675222: Merge "Fix potential segfault in RS watchdog." into ics-mr0
* commit '
af3a854b549409c4ad77c686e860f97ea86706a0':
Fix potential segfault in RS watchdog.
Svetoslav Ganov [Wed, 2 Nov 2011 17:14:46 +0000 (10:14 -0700)]
Merge "CalendarView title incorrectly updated for different languages." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:55 +0000 (10:13 -0700)]
Merge "Accessibility window query APIs should respect root name space." into ics-mr1
Svetoslav Ganov [Wed, 2 Nov 2011 17:13:17 +0000 (10:13 -0700)]
Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen and font sizes." into ics-mr1
The Android Automerger [Wed, 2 Nov 2011 17:05:33 +0000 (10:05 -0700)]
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
This reverts commit
2d280f754e32e556407df05d977cfabdfff1c070, reversing
changes made to
2cc1c5d067736f221554be593c2ba2c96390f847.
The Android Automerger [Wed, 2 Nov 2011 16:48:55 +0000 (09:48 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Automerger [Wed, 2 Nov 2011 13:28:40 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Irfan Sheriff [Wed, 2 Nov 2011 04:18:14 +0000 (04:18 +0000)]
am
953005e8: Merge "Specify component name for provisioning" into ics-mr0
* commit '
953005e8243e4dc898a00d9a1612ae82772913b9':
Specify component name for provisioning
Jeff Sharkey [Wed, 2 Nov 2011 04:16:13 +0000 (04:16 +0000)]
am
db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
* commit '
db0ab2e731d755f64583c5704fa406bc0e7a2af4':
Process AMS events in NetworkPolicy handler.
Irfan Sheriff [Wed, 2 Nov 2011 04:15:26 +0000 (21:15 -0700)]
Merge "Specify component name for provisioning" into ics-mr0
Jeff Sharkey [Wed, 2 Nov 2011 04:14:35 +0000 (21:14 -0700)]
Merge "Process AMS events in NetworkPolicy handler." into ics-mr0
Dianne Hackborn [Wed, 2 Nov 2011 04:11:18 +0000 (21:11 -0700)]
Merge "Add new OOM adjustment for the "previous" process." into ics-mr1
Fabrice Di Meglio [Wed, 2 Nov 2011 02:17:48 +0000 (02:17 +0000)]
am
bcf05a69: Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
* commit '
bcf05a69090f342d328f1537d1d83406b883290b':
Fix bug #
5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
Dianne Hackborn [Wed, 2 Nov 2011 01:02:44 +0000 (18:02 -0700)]
Merge "Some optimizations." into ics-mr1
Adam Powell [Wed, 2 Nov 2011 00:27:26 +0000 (17:27 -0700)]
Merge "Fix bug
5528574 - "View not attached to window manager" upon orientation change when there is a dialog with ActionMode on" into ics-mr1
Fabrice Di Meglio [Wed, 2 Nov 2011 00:25:22 +0000 (17:25 -0700)]
Merge "Fix bug #
5438102 Double Arabic harakat overlap instead of stack In TextView"
Katie McCormick [Wed, 2 Nov 2011 00:11:01 +0000 (00:11 +0000)]
am
d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0
* commit '
d5b25ecc07efb9d7f725731f29241217266b4c0c':
Doc Update: Update list of widget classes
Katie McCormick [Wed, 2 Nov 2011 00:09:44 +0000 (17:09 -0700)]
Merge "Doc Update: Update list of widget classes" into ics-mr0
Dima Zavin [Tue, 1 Nov 2011 22:32:06 +0000 (22:32 +0000)]
am
f0ad147f: Merge "BatteryService(jni): properly handle read\'s return value" into ics-mr0
* commit '
f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3':
BatteryService(jni): properly handle read's return value
Dima Zavin [Tue, 1 Nov 2011 22:29:42 +0000 (15:29 -0700)]
Merge "BatteryService(jni): properly handle read's return value" into ics-mr0
Eric Laurent [Tue, 1 Nov 2011 21:59:18 +0000 (21:59 +0000)]
am
cd84197a: am
6e91e5b6: Merge "Fix volume indication in vibrate mode." into ics-mr0
* commit '
cd84197ac1226432de2e13c8fd678a4c88511e0f':
Fix volume indication in vibrate mode.
Martijn Coenen [Tue, 1 Nov 2011 21:59:16 +0000 (21:59 +0000)]
am
b288f993: am
1eca250b: Merge "Fix disableForegroundNdefPush crash." into ics-mr0
* commit '
b288f99334348a21ffb465b37a4522998b452410':
Fix disableForegroundNdefPush crash.
Pannag Sanketi [Tue, 1 Nov 2011 21:59:09 +0000 (21:59 +0000)]
am
dd79b4c8: Merge "Expose video stabilization API" into ics-mr1
* commit '
dd79b4c85a9dd2c2ad702ea2137fe2a076567fa1':
Expose video stabilization API
Svetoslav Ganov [Tue, 1 Nov 2011 21:58:52 +0000 (21:58 +0000)]
am
62015f5d: am
aeb11b59: Merge "Folding Accessibility Service sample into ApiDemos." into ics-mr0
* commit '
62015f5d0d1104dfc682b3eb3b6c0be4f63b985a':
Folding Accessibility Service sample into ApiDemos.
The Android Open Source Project [Tue, 1 Nov 2011 21:28:57 +0000 (14:28 -0700)]
Reconcile with ics-mr0-release
Change-Id: I14f9c7648ae8cc7403a6c605d12aba8eec553e80
Mangesh Ghiware [Tue, 1 Nov 2011 21:02:05 +0000 (14:02 -0700)]
Merge "Fix setInitialScale() to take display density into account." into ics-mr1
Eric Fischer [Tue, 1 Nov 2011 20:53:14 +0000 (13:53 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Michael Jurka [Tue, 1 Nov 2011 20:53:02 +0000 (13:53 -0700)]
Merge "Fix: never show recents over lock screen" into ics-mr1
Peter Ng [Tue, 1 Nov 2011 20:45:18 +0000 (13:45 -0700)]
Merge "Asset updates for tablet notifications and layout fixes to quicksettings" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 20:30:24 +0000 (13:30 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr1
Robert Greenwalt [Tue, 1 Nov 2011 20:29:42 +0000 (20:29 +0000)]
am
bd9b1528: Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
* commit '
bd9b1528051a1b257768fdbc5077a2d4473b02dd':
Add cdma_rmnet4 to list of monitored interfaces
Robert Greenwalt [Tue, 1 Nov 2011 20:27:56 +0000 (13:27 -0700)]
Merge "Add cdma_rmnet4 to list of monitored interfaces" into ics-mr0
Daniel Sandler [Tue, 1 Nov 2011 20:05:41 +0000 (13:05 -0700)]
Merge "Bring timestamps back to notifications." into ics-mr1
Jim Miller [Tue, 1 Nov 2011 19:45:11 +0000 (12:45 -0700)]
Merge "Fix
5404916: Make layout fit on 480x800 hdpi device" into ics-mr1
Fabrice Di Meglio [Tue, 1 Nov 2011 19:42:48 +0000 (19:42 +0000)]
am
46e327ca: (-s ours) Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
* commit '
46e327ca32a29432941ba4487077577b10243aed':
Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE
Fabrice Di Meglio [Tue, 1 Nov 2011 19:41:04 +0000 (12:41 -0700)]
Merge "Fix bug #
5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0
OSDN Git Service
