OSDN Git Service
The Android Open Source Project [Thu, 13 Oct 2011 14:04:51 +0000 (07:04 -0700)]
Reconcile with ics-mr0-release
Change-Id: I326384d8f33fbf4aceaf34331983727fd6bf256f
The Android Automerger [Thu, 13 Oct 2011 13:28:07 +0000 (06:28 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Wu-cheng Li [Thu, 13 Oct 2011 06:36:14 +0000 (23:36 -0700)]
am
514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
* commit '
514a6cfb7f7085b266f457155ff63373d2dff8ee':
Improve camera javadoc and fix some errors.
Wu-cheng Li [Thu, 13 Oct 2011 06:34:01 +0000 (23:34 -0700)]
Merge "Improve camera javadoc and fix some errors." into ics-mr0
Scott Main [Thu, 13 Oct 2011 03:58:09 +0000 (20:58 -0700)]
am
8da11914: cherrypick from hc-mr2 Change-Id: I76de309e70026720d30772ff5b428f7aefc8de4c docs: add docs about "screenSize" configuration changes
* commit '
8da119148fb8c20ec49917a6c106a0f731227238':
cherrypick from hc-mr2 Change-Id: I76de309e70026720d30772ff5b428f7aefc8de4c docs: add docs about "screenSize" configuration changes
Brian Colonna [Thu, 13 Oct 2011 02:15:48 +0000 (19:15 -0700)]
Brian Colonna [Thu, 13 Oct 2011 02:14:03 +0000 (19:14 -0700)]
Merge "Fixes
5446301" into ics-mr0
Jim Miller [Thu, 13 Oct 2011 01:52:06 +0000 (18:52 -0700)]
am
207c6731: Merge "Fix
5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
* commit '
207c67315c8668b72cbb7bd370f1d6c8479eabd4':
Fix
5444675: Fix vibrate regression on Pattern and PIN unlock screens.
Jim Miller [Thu, 13 Oct 2011 01:49:25 +0000 (18:49 -0700)]
Merge "Fix
5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
Jason Sams [Thu, 13 Oct 2011 01:36:58 +0000 (18:36 -0700)]
Merge "Fix bug with 1D arrays and threading. Some elements got launched multiple times."
Daniel Lehmann [Thu, 13 Oct 2011 01:18:08 +0000 (18:18 -0700)]
am
cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0
* commit '
cc21cc017ba02338a78eca00af6a1a0d3f7ce5bf':
Allow clearing out the source bounds
Daniel Lehmann [Thu, 13 Oct 2011 01:16:15 +0000 (18:16 -0700)]
Merge "Allow clearing out the source bounds" into ics-mr0
Wink Saville [Thu, 13 Oct 2011 01:16:08 +0000 (18:16 -0700)]
am
2e6c3329: Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0
* commit '
2e6c332962fb0f64ad65cda3b798c744e0124ad9':
Set roaming indicator to off if Perferred Roaming List is not loaded.
Wink Saville [Thu, 13 Oct 2011 01:13:20 +0000 (18:13 -0700)]
Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0
Adam Powell [Thu, 13 Oct 2011 01:03:36 +0000 (18:03 -0700)]
Merge "Fix bug
5394020 - Menus are pretty sluggish to bring up"
Dianne Hackborn [Thu, 13 Oct 2011 00:06:27 +0000 (17:06 -0700)]
am
f4b40de6: Merge "Fix issue #
5445966: WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0
* commit '
f4b40de684b3574475205542f22b2d49a75f31eb':
Fix issue #
5445966: WindowManager reporting -long on prime when it shouldn't be.
Winson Chung [Thu, 13 Oct 2011 00:04:08 +0000 (17:04 -0700)]
am
a76a87a8: (-s ours) Merge "DO NOT MERGE. Improve screenshot chord debouncing. Bug:
5011907" into ics-mr0
* commit '
a76a87a8efbc1e6d3d6f503d937ab18a91638ecf':
DO NOT MERGE. Improve screenshot chord debouncing. Bug:
5011907
Dianne Hackborn [Thu, 13 Oct 2011 00:01:18 +0000 (17:01 -0700)]
Merge "Fix issue #
5445966: WindowManager reporting -long on prime when it shouldn't be." into ics-mr0
Winson Chung [Thu, 13 Oct 2011 00:00:11 +0000 (17:00 -0700)]
Merge "DO NOT MERGE. Improve screenshot chord debouncing. Bug:
5011907" into ics-mr0
John Wang [Wed, 12 Oct 2011 22:36:33 +0000 (15:36 -0700)]
am
f838b7c2: Merge "Support selectNetworkManually in LTEPhone." into ics-mr0
* commit '
f838b7c2b8c4f0f1c48f315f49fea340b2b10d83':
Support selectNetworkManually in LTEPhone.
Justin Ho [Wed, 12 Oct 2011 22:36:31 +0000 (15:36 -0700)]
am
f1ec8855: Merge "Updated list selectors Bug:
5450396" into ics-mr0
* commit '
f1ec8855667aa3edd4a2115565b00746f340387a':
Updated list selectors Bug:
5450396
John Wang [Wed, 12 Oct 2011 22:34:56 +0000 (15:34 -0700)]
Merge "Support selectNetworkManually in LTEPhone." into ics-mr0
Robert Ly [Wed, 12 Oct 2011 22:34:28 +0000 (15:34 -0700)]
am
a9a21c2a: (-s ours) Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0
* commit '
a9a21c2aa900fe63c4e9ccce4d62387d921a4b74':
DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215
Justin Ho [Wed, 12 Oct 2011 22:33:49 +0000 (15:33 -0700)]
Merge "Updated list selectors Bug:
5450396" into ics-mr0
Robert Ly [Wed, 12 Oct 2011 22:32:38 +0000 (15:32 -0700)]
Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0
Robert Ly [Wed, 12 Oct 2011 22:08:49 +0000 (15:08 -0700)]
am
83b740ab: (-s ours) Merge "DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d" into ics-mr0
* commit '
83b740ab1e1de378edfd4d2f78c8f2a7f7ce810a':
DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d
Robert Ly [Wed, 12 Oct 2011 22:06:51 +0000 (15:06 -0700)]
am
0f7e4e8e: (-s ours) Merge "DO NOT MERGE cherrypick from master" into ics-mr0
* commit '
0f7e4e8e937c4d69ec1742fc03a1a5775bfa2877':
DO NOT MERGE cherrypick from master
Robert Ly [Wed, 12 Oct 2011 22:05:26 +0000 (15:05 -0700)]
Merge "DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d" into ics-mr0
Robert Ly [Wed, 12 Oct 2011 22:05:01 +0000 (15:05 -0700)]
Merge "DO NOT MERGE cherrypick from master" into ics-mr0
Fred Quintana [Wed, 12 Oct 2011 21:53:34 +0000 (14:53 -0700)]
Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely"
Jeff Brown [Wed, 12 Oct 2011 21:49:57 +0000 (14:49 -0700)]
Merge "Improve screenshot chord debouncing. Bug:
5011907"
Joe Fernandez [Wed, 12 Oct 2011 21:39:58 +0000 (14:39 -0700)]
am
99b70f3f: (-s ours) DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
* commit '
99b70f3f5d051261229d1792c169a374fc23326b':
DO NOT MERGE cherrypick from master Change-Id: I63bc055991405c56e9dcc83a54b106b870cf6b29
Romain Guy [Wed, 12 Oct 2011 21:12:22 +0000 (14:12 -0700)]
Merge "Add missing public native API"
Andreas Huber [Wed, 12 Oct 2011 20:52:21 +0000 (13:52 -0700)]
am
8c7951af: Merge "Assume a PTS of 0 if absent, don\'t bail on fragmented PES packets not having PTS" into ics-mr0
* commit '
8c7951afa28ffa08efe3c920db364788a0968f94':
Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
Andreas Huber [Wed, 12 Oct 2011 20:51:05 +0000 (13:51 -0700)]
Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0
Romain Guy [Wed, 12 Oct 2011 20:50:11 +0000 (13:50 -0700)]
Merge "Reduce the size of libhwui by 50%"
Romain Guy [Wed, 12 Oct 2011 20:48:51 +0000 (13:48 -0700)]
Reduce the size of libhwui by 50%
This change removes unnessary symbols. All symbols are hidden by
default, public APIs with exported symbols are explicitly marked
with ANDROID_API.
Change-Id: I692fde432a86c12108de1cfd1f6504919a7d5f3f
RoboErik [Wed, 12 Oct 2011 20:45:12 +0000 (13:45 -0700)]
Merge "Fix immenent build breakage."
RoboErik [Wed, 12 Oct 2011 20:29:34 +0000 (13:29 -0700)]
Merge "Add hidden API to prepare for increasing calendar support"
Jason Sams [Wed, 12 Oct 2011 20:20:22 +0000 (13:20 -0700)]
Merge "Fix example code."
Daniel Sandler [Wed, 12 Oct 2011 20:12:37 +0000 (13:12 -0700)]
am
fd8f6f2f: Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
* commit '
fd8f6f2f7557c414466f7634391821e59c1ce040':
Fix obsolete Honeycomb platlogo.
Daniel Sandler [Wed, 12 Oct 2011 20:11:13 +0000 (13:11 -0700)]
Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
Jamie Gennis [Wed, 12 Oct 2011 20:04:36 +0000 (13:04 -0700)]
am
075e4c3d: Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
* commit '
075e4c3d2e6a8a9eb3506dfedc8da938fb65fb65':
SurfaceFlinger: update orientation via transactions
Jamie Gennis [Wed, 12 Oct 2011 20:03:11 +0000 (13:03 -0700)]
Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
Joe Fernandez [Wed, 12 Oct 2011 19:49:47 +0000 (12:49 -0700)]
Merge "docs: Camera API Developer Guide"
Fabrice Di Meglio [Wed, 12 Oct 2011 19:42:12 +0000 (12:42 -0700)]
am
87228cd7: Merge "Fix bug #
5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
* commit '
87228cd7bb9a39e2bb33a767d214c8d834f840df':
Fix bug #
5446966 Changing Gravity on a TextView does not change how the text is aligned
Fabrice Di Meglio [Wed, 12 Oct 2011 19:39:55 +0000 (12:39 -0700)]
Merge "Fix bug #
5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
Adam Powell [Wed, 12 Oct 2011 19:26:42 +0000 (12:26 -0700)]
am
f2894659: Fix bug
5449931 - Wrong theme for icon menus
* commit '
f2894659e8df625783afcd3fa17462ab23d29145':
Fix bug
5449931 - Wrong theme for icon menus
Jason Sams [Wed, 12 Oct 2011 19:20:04 +0000 (12:20 -0700)]
Merge "Improve rsForEach overhead."
Robert Ly [Wed, 12 Oct 2011 19:05:49 +0000 (12:05 -0700)]
Merge "docs: changes to toc for RS, graphics, and animation"
Scott Main [Wed, 12 Oct 2011 19:00:40 +0000 (12:00 -0700)]
am
c2916535: Merge "docs: add Fujitsu USB info bug
5427262" into ics-mr0
* commit '
c291653539fd0a8b6b73a1174aa80afdb62272e5':
docs: add Fujitsu USB info bug
5427262
Scott Main [Wed, 12 Oct 2011 18:19:17 +0000 (11:19 -0700)]
Merge "docs: add Fujitsu USB info bug
5427262" into ics-mr0
Peter Ng [Wed, 12 Oct 2011 18:15:29 +0000 (11:15 -0700)]
Merge "darker notification press state and divider"
Eino-Ville Talvala [Wed, 12 Oct 2011 17:40:11 +0000 (10:40 -0700)]
am
0a273592: Merge "Add video stabilization control to Camera parameters." into ics-mr0
* commit '
0a2735928030229b3340074eb11c2423342fda93':
Add video stabilization control to Camera parameters.
Eino-Ville Talvala [Wed, 12 Oct 2011 17:37:57 +0000 (10:37 -0700)]
Merge "Add video stabilization control to Camera parameters." into ics-mr0
Amith Yamasani [Wed, 12 Oct 2011 17:00:54 +0000 (10:00 -0700)]
am
421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
* commit '
421648ed06a2c944bc6a5fa866d461761533005b':
Backup owner info as part of settings backup. DO NOT MERGE.
Steve Block [Wed, 12 Oct 2011 17:00:48 +0000 (10:00 -0700)]
am
c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
* commit '
c0c394ee053c1b62da58247c431c20d5939c4ada':
Modify BrowserFrame.requestClientCert() to take the host and port as a String
Amith Yamasani [Wed, 12 Oct 2011 16:59:11 +0000 (09:59 -0700)]
Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
Steve Block [Wed, 12 Oct 2011 16:58:25 +0000 (09:58 -0700)]
Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
Gilles Debunne [Wed, 12 Oct 2011 16:51:17 +0000 (09:51 -0700)]
Merge "Bug
5385279: IOOB in createMisspelledSuggestionSpan"
Gilles Debunne [Wed, 12 Oct 2011 16:50:45 +0000 (09:50 -0700)]
Merge "Bug
5237623: word no longer underlined after replacement"
Robert Ly [Wed, 12 Oct 2011 16:50:31 +0000 (09:50 -0700)]
Merge "docs: restructure animation and add container doc"
Robert Ly [Wed, 12 Oct 2011 16:50:26 +0000 (09:50 -0700)]
Merge "docs: restructure graphics docs and add hw-acceleration docs"
Amith Yamasani [Wed, 12 Oct 2011 16:45:22 +0000 (09:45 -0700)]
Merge "Backup owner info as part of settings backup."
Jean-Michel Trivi [Wed, 12 Oct 2011 16:42:48 +0000 (09:42 -0700)]
am
49f61439: (-s ours) Merge "DO NOT MERGE Fix
5389442 RemoteControlClient javadoc" into ics-mr0
* commit '
49f61439db7f8960745b0a5664795b5a5ad31ef8':
DO NOT MERGE Fix
5389442 RemoteControlClient javadoc
Jean-Michel Trivi [Wed, 12 Oct 2011 16:40:17 +0000 (09:40 -0700)]
Merge "DO NOT MERGE Fix
5389442 RemoteControlClient javadoc" into ics-mr0
Jake Hamby [Wed, 12 Oct 2011 08:21:34 +0000 (01:21 -0700)]
am
34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
* commit '
34877877bb563e7e20600e6777cca4dc358a12d9':
Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
Jake Hamby [Wed, 12 Oct 2011 08:10:28 +0000 (01:10 -0700)]
Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
Adam Powell [Wed, 12 Oct 2011 02:33:29 +0000 (19:33 -0700)]
am
35af3639: Merge "Fix bug
5173029 - make fast scroller aware of scrolling containers" into ics-mr0
* commit '
35af3639a169b1b8e5f4d96579795e5480080b52':
Fix bug
5173029 - make fast scroller aware of scrolling containers
Adam Powell [Wed, 12 Oct 2011 02:30:08 +0000 (19:30 -0700)]
Merge "Fix bug
5173029 - make fast scroller aware of scrolling containers" into ics-mr0
Svetoslav Ganov [Wed, 12 Oct 2011 01:41:05 +0000 (18:41 -0700)]
am
52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
* commit '
5276373430af24448324941af6b911d90a3ddd10':
Dragging in touch explore mode should not become exploring.
Svetoslav Ganov [Wed, 12 Oct 2011 01:39:36 +0000 (18:39 -0700)]
Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
Justin Ho [Wed, 12 Oct 2011 00:53:40 +0000 (17:53 -0700)]
Merge "Integrating updated system bar assets Bug:
5353986"
Jake Hamby [Wed, 12 Oct 2011 00:32:53 +0000 (17:32 -0700)]
am
c5b28bd0: Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
* commit '
c5b28bd00dd1be682103275815f588870c6fec7d':
Change DCS of MO SMS to the correct value for UCS-2 encoding.
Jake Hamby [Wed, 12 Oct 2011 00:23:04 +0000 (17:23 -0700)]
Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
Adam Powell [Tue, 11 Oct 2011 23:16:09 +0000 (16:16 -0700)]
am
acf7d982: Merge "Fix bug
5434403 - invalidation problem with seek bars at edges" into ics-mr0
* commit '
acf7d982ae981c039ec8445a30da91be0a4fbbc5':
Fix bug
5434403 - invalidation problem with seek bars at edges
Adam Powell [Tue, 11 Oct 2011 23:14:31 +0000 (16:14 -0700)]
Merge "Fix bug
5434403 - invalidation problem with seek bars at edges" into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 23:00:54 +0000 (16:00 -0700)]
Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"
Michael Kolb [Tue, 11 Oct 2011 22:33:37 +0000 (15:33 -0700)]
am
f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
* commit '
f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
Support spellcheck attribute in WebTextView
Michael Jurka [Tue, 11 Oct 2011 22:33:36 +0000 (15:33 -0700)]
am
78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0
* commit '
78bbcd31aac4e6744a00ee0a6bd6ac5cc1bec673':
Refactoring loading of recent apps
Adam Powell [Tue, 11 Oct 2011 22:33:33 +0000 (15:33 -0700)]
am
1a4c4334: Merge "Fix bug
5396097 - menu theme consistency" into ics-mr0
* commit '
1a4c4334f02152c96cfc71136dc31085826c6894':
Fix bug
5396097 - menu theme consistency
Jeff Brown [Tue, 11 Oct 2011 22:33:28 +0000 (15:33 -0700)]
am
58bf986c: Merge "Use ashmem for CursorWindows. Bug:
5332296" into ics-mr0
* commit '
58bf986c3e3948242e89654e6d59b97a21345582':
Use ashmem for CursorWindows. Bug:
5332296
Svetoslav Ganov [Tue, 11 Oct 2011 22:33:26 +0000 (15:33 -0700)]
am
a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
* commit '
a72a80632b07dd7faf0ca2a4a0eae2770b14caa6':
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
Svetoslav Ganov [Tue, 11 Oct 2011 22:33:25 +0000 (15:33 -0700)]
am
52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
* commit '
52f7fcf844ffdf5f03bca58e58b1ee3e8cc1a4c5':
DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
Michael Kolb [Tue, 11 Oct 2011 22:25:22 +0000 (15:25 -0700)]
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
Jean-Michel Trivi [Tue, 11 Oct 2011 22:24:15 +0000 (15:24 -0700)]
Merge "Fix
5389442 RemoteControlClient javadoc"
Michael Jurka [Tue, 11 Oct 2011 22:23:08 +0000 (15:23 -0700)]
Merge "Refactoring loading of recent apps" into ics-mr0
Adam Powell [Tue, 11 Oct 2011 22:07:36 +0000 (15:07 -0700)]
Merge "Fix bug
5396097 - menu theme consistency" into ics-mr0
Jeff Sharkey [Tue, 11 Oct 2011 21:54:08 +0000 (14:54 -0700)]
Merge "Update internal state when iface is removed."
Romain Guy [Tue, 11 Oct 2011 21:51:18 +0000 (14:51 -0700)]
Merge "Fix the build"
Romain Guy [Tue, 11 Oct 2011 21:10:10 +0000 (14:10 -0700)]
Merge "Check whether an AsyncTask is created/executed on a looper thread."
Romain Guy [Tue, 11 Oct 2011 21:07:15 +0000 (14:07 -0700)]
Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #
5439406"
Jeff Brown [Tue, 11 Oct 2011 20:54:45 +0000 (13:54 -0700)]
Merge "Use ashmem for CursorWindows. Bug:
5332296" into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 20:54:28 +0000 (13:54 -0700)]
Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
Svetoslav Ganov [Tue, 11 Oct 2011 20:54:23 +0000 (13:54 -0700)]
Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
John Reck [Tue, 11 Oct 2011 20:49:59 +0000 (13:49 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
Jamie Gennis [Mon, 10 Oct 2011 22:48:06 +0000 (15:48 -0700)]
SurfaceFlinger: update orientation via transactions
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState. It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.
Bug:
5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
Nick Pelly [Tue, 11 Oct 2011 19:39:46 +0000 (12:39 -0700)]
Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's."
Jeff Brown [Tue, 11 Oct 2011 19:35:05 +0000 (12:35 -0700)]
Merge "Don't log BlockGuard violations on ENG builds."
Daniel Sandler [Tue, 11 Oct 2011 19:01:15 +0000 (12:01 -0700)]
Merge "Stop enabling all disabled status bar features from GlobalActions."
OSDN Git Service
