OSDN Git Service
RoboErik [Fri, 8 Jul 2011 22:28:26 +0000 (15:28 -0700)]
Merge "Unhide CalendarContract apis"
RoboErik [Tue, 14 Jun 2011 21:01:15 +0000 (14:01 -0700)]
Unhide CalendarContract apis
This exposes the set of apis necessary to unbundle the Calendar
app and sync adapters as well as allowing third party developers
to officially access the calendar provider. This is the current
final set of apis to expose, though changes may occur if we
discover new issues. The documentation and CTS tests are still
in progress.
Change-Id: If77f9a1d49a26725b44b1014e8d088be7ffbc707
Jaikumar Ganesh [Fri, 8 Jul 2011 22:01:18 +0000 (15:01 -0700)]
Merge "Get server's listening channel"
Gilles Debunne [Fri, 8 Jul 2011 21:56:14 +0000 (14:56 -0700)]
Merge "Animation settings reset to default"
Ben Dodson [Fri, 8 Jul 2011 21:36:42 +0000 (14:36 -0700)]
Get server's listening channel
Change-Id: Ia1cb3486a4ba502185efdcf6d7bcf0f37bb55261
James Dong [Fri, 8 Jul 2011 21:17:16 +0000 (14:17 -0700)]
Merge "Use advertised h264 encoding parameters by default if the profile is not baseline"
Glenn Kasten [Fri, 8 Jul 2011 21:06:24 +0000 (14:06 -0700)]
Merge "Fix build warning; LOG_TAG was misplaced"
RoboErik [Fri, 8 Jul 2011 21:05:42 +0000 (14:05 -0700)]
Merge "Pseudo-final api fixes to CalendarContract"
RoboErik [Fri, 8 Jul 2011 20:39:05 +0000 (13:39 -0700)]
Pseudo-final api fixes to CalendarContract
This removes the public projections and makes them arguments
that are passed in instead.
Change-Id: Ic9807d4994a9f2798b0ecf9a63194193715931e0
Jim Miller [Fri, 8 Jul 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Fix
4689527: Improved curation for Recents + misc cleanup"
Christopher Tate [Fri, 8 Jul 2011 19:48:48 +0000 (12:48 -0700)]
Merge "Can now restore a subset of apps from historical dataset"
John Reck [Fri, 8 Jul 2011 19:43:22 +0000 (12:43 -0700)]
Merge "NPE guard in setupViewport"
Christopher Tate [Thu, 7 Jul 2011 21:31:18 +0000 (14:31 -0700)]
Can now restore a subset of apps from historical dataset
Adds the ability to filter a restore of an historical dataset so that it
only restores certain apps' data regardless of what is actually present
in the dataset. This is currently only used by the bmgr command-line tool,
for debugging / developer support.
Bug
2021590
Change-Id: I7685e5d609b0f5506f71d70c26410602bb387659
Wink Saville [Fri, 8 Jul 2011 19:28:27 +0000 (12:28 -0700)]
am
a736cd54: am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
a736cd54e1de62e84a7a49a3c68c56fc6d9bfc00':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Romain Guy [Fri, 8 Jul 2011 18:58:18 +0000 (11:58 -0700)]
Merge "Correctly position layers."
Romain Guy [Fri, 8 Jul 2011 18:57:29 +0000 (11:57 -0700)]
Correctly position layers.
Change-Id: I1678b1c5bdab140b44e56556c50ab8329255f18a
Kristian Monsen [Fri, 8 Jul 2011 18:31:33 +0000 (11:31 -0700)]
Merge "Merge Chromium at r12.0.742.93: New autofill string"
John Reck [Fri, 8 Jul 2011 18:22:38 +0000 (11:22 -0700)]
NPE guard in setupViewport
Bug:
4163660
Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
Gilles Debunne [Fri, 8 Jul 2011 17:40:51 +0000 (10:40 -0700)]
Animation settings reset to default
Change-Id: Ie53c031ceb88d356742e80693edc14198506d54a
Robert Greenwalt [Fri, 8 Jul 2011 18:06:55 +0000 (11:06 -0700)]
Merge "Remove unused setHttpProxy."
James Dong [Thu, 7 Jul 2011 23:41:25 +0000 (16:41 -0700)]
Use advertised h264 encoding parameters by default if the profile is not baseline
o Force to use AVC baseline profile for camcorder low quality videos
Change-Id: I3424c57dd0c55fc4991f5767b57695c8f3420ecb
Narayan Kamath [Fri, 8 Jul 2011 11:13:03 +0000 (12:13 +0100)]
Add event-log logging for TTS requests.
Change-Id: I5023194c469a602b85259088a2e59373c96a941e
Wink Saville [Fri, 8 Jul 2011 16:40:03 +0000 (09:40 -0700)]
am
848aa3ab: Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
* commit '
848aa3ab8a00835c5af2ead954c7736e507249b5':
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Glenn Kasten [Fri, 8 Jul 2011 16:32:50 +0000 (09:32 -0700)]
Fix build warning; LOG_TAG was misplaced
Change-Id: I4fb0590f626445188f9053367707878b2fa0fa30
Kristian Monsen [Fri, 8 Jul 2011 15:45:10 +0000 (16:45 +0100)]
Merge Chromium at r12.0.742.93: New autofill string
Added a string that we now use.
Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
Jim Miller [Fri, 8 Jul 2011 03:53:52 +0000 (20:53 -0700)]
Fix
4689527: Improved curation for Recents + misc cleanup
This sets a threshhold for both the curation animation as well as the
snap back animation. It now limits these to 500ms and 250ms, respectively.
Cleaned up misc log spew.
Updated after review.
Change-Id: Ie11a2fc4556b396257c33c3ebd7513c4c220ff95
Romain Guy [Fri, 8 Jul 2011 04:35:19 +0000 (21:35 -0700)]
Merge "Cleanup"
Romain Guy [Fri, 8 Jul 2011 04:33:41 +0000 (21:33 -0700)]
Cleanup
Change-Id: I2a9dc34e907b4c6e60f8c2999150b22015012e74
Romain Guy [Fri, 8 Jul 2011 04:28:41 +0000 (21:28 -0700)]
Merge "Use NEAREST filtering mode for TextureView.getBitmap()."
Romain Guy [Fri, 8 Jul 2011 04:05:04 +0000 (21:05 -0700)]
Use NEAREST filtering mode for TextureView.getBitmap().
Change-Id: I4649062bbdf18ebba7924bdf578f39ad8f6576ac
Adam Powell [Fri, 8 Jul 2011 03:55:10 +0000 (20:55 -0700)]
Merge "Add ALL CAPS style to TextView/TextAppearance"
Romain Guy [Fri, 8 Jul 2011 03:55:08 +0000 (20:55 -0700)]
Merge "Use NEAREST filtering for layers whenever possible."
Romain Guy [Fri, 8 Jul 2011 03:50:11 +0000 (20:50 -0700)]
Use NEAREST filtering for layers whenever possible.
Change-Id: Id5bee1bd4a322cf93e8000b08e18f1e1b058648e
Adam Powell [Fri, 8 Jul 2011 01:35:54 +0000 (18:35 -0700)]
Add ALL CAPS style to TextView/TextAppearance
Switch out ugly hack in action menu items for the new style.
Change-Id: I68a0ed62a352b14d499e6478b82bbc12dcb5a030
Michael Jurka [Thu, 7 Jul 2011 23:28:03 +0000 (16:28 -0700)]
Merge "Handling Resources.NotFoundException in Recents"
Jason Sams [Thu, 7 Jul 2011 23:24:51 +0000 (16:24 -0700)]
Merge "Fix more type info caching bugs."
Jason Sams [Thu, 7 Jul 2011 23:17:36 +0000 (16:17 -0700)]
Fix more type info caching bugs.
Change-Id: I917a1190ec12fe954c9bf51ffd446ef564837e68
Shimeng (Simon) Wang [Thu, 7 Jul 2011 23:17:16 +0000 (16:17 -0700)]
Merge "Update viewport asap."
Jason Sams [Thu, 7 Jul 2011 23:10:38 +0000 (16:10 -0700)]
Merge "Fix defered type creation when loading from A3D."
Gilles Debunne [Thu, 7 Jul 2011 23:07:07 +0000 (16:07 -0700)]
Merge "XmlDocumentProvider moved to the XmlAdapter sample code"
Jason Sams [Thu, 7 Jul 2011 23:05:18 +0000 (16:05 -0700)]
Fix defered type creation when loading from A3D.
Change-Id: I09387c0859dcc9fe77014bc7486109d81742f298
Jason Sams [Thu, 7 Jul 2011 22:50:41 +0000 (15:50 -0700)]
Merge "AllocationAdapter cleanup."
Michael Jurka [Thu, 7 Jul 2011 22:42:30 +0000 (15:42 -0700)]
Handling Resources.NotFoundException in Recents
Eric Laurent [Thu, 7 Jul 2011 22:37:07 +0000 (15:37 -0700)]
Merge "Moved and renamed effect API header files"
Joe Fernandez [Thu, 7 Jul 2011 22:33:15 +0000 (15:33 -0700)]
Merge "Revert "docs: OpenGL Tutorials""
Shimeng (Simon) Wang [Thu, 7 Jul 2011 22:26:22 +0000 (15:26 -0700)]
Update viewport asap.
Update viewport as soon as possible to make sure layout has correct viewport.
This helps fixes gmail flickering issue.
Also helps the case a mobile site is switched to desktop when the
user agent is switched.
issue:
4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
Eric Laurent [Fri, 24 Jun 2011 14:01:31 +0000 (07:01 -0700)]
Moved and renamed effect API header files
Moved specific effect header files to
system/media/audio_effects/include/audio_effects
and renamed to lower case (effect_xxx.h).
Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
Jason Sams [Thu, 7 Jul 2011 22:24:42 +0000 (15:24 -0700)]
AllocationAdapter cleanup.
Change-Id: Ia7eb0925e410779bbd6a925af721e3834dcf83f8
Joe Fernandez [Thu, 7 Jul 2011 22:22:09 +0000 (15:22 -0700)]
Revert "docs: OpenGL Tutorials"
This reverts commit
4cd8360943a167505c929a309cccd7cb56eb4138
Huahui Wu [Thu, 7 Jul 2011 22:10:25 +0000 (15:10 -0700)]
Merge "Revert "b/
3302378 Passes touch pressures, size and timestamps to webkit.""
Huahui Wu [Thu, 7 Jul 2011 21:27:44 +0000 (14:27 -0700)]
Revert "b/
3302378 Passes touch pressures, size and timestamps to webkit."
This reverts commit
6e64e0c61720244894dbd1fd6b36394adc63b2de.
It introduced a null pointer crash for pinch-and-zoom.
Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
Jamie Gennis [Thu, 7 Jul 2011 21:42:12 +0000 (14:42 -0700)]
Merge "SurfaceTexture: enable newly passing tests."
Wink Saville [Thu, 7 Jul 2011 21:39:23 +0000 (14:39 -0700)]
Merge "No need to have BASE_DATA_CONNECTION_TRACKER start at 50000." into honeycomb-LTE
Adam Powell [Thu, 7 Jul 2011 21:35:22 +0000 (14:35 -0700)]
Merge "Action bar layout tweaks"
Jim Miller [Thu, 7 Jul 2011 21:35:18 +0000 (14:35 -0700)]
Merge "Fix
4689527: Fix rendering issue with thumbnails on phones"
Joe Fernandez [Thu, 7 Jul 2011 21:31:02 +0000 (14:31 -0700)]
Merge "docs: OpenGL Tutorials"
Philip Milne [Thu, 7 Jul 2011 21:30:31 +0000 (14:30 -0700)]
Merge "Simplify and tidy the API for maximum value support."
Jim Miller [Thu, 7 Jul 2011 02:57:05 +0000 (19:57 -0700)]
Fix
4689527: Fix rendering issue with thumbnails on phones
This fixes a bug where the phone thumbnail scale was being miscalculated
for the square aspect of thumbnails on phones. The code now constrains
thumbnails to fit the smaller of screen width and screen height.
Change-Id: I174abacd4cf3dcf124e10fe8980fb01fe299ec6a
Philip Milne [Thu, 7 Jul 2011 18:47:08 +0000 (11:47 -0700)]
Simplify and tidy the API for maximum value support.
Also:
. Remove CAN_SHRINK, FIXED from public view. These can be added later.
Change-Id: I63a64ac4748605da60373c8e3c2109178b5260c2
Wink Saville [Thu, 7 Jul 2011 21:16:30 +0000 (14:16 -0700)]
No need to have BASE_DATA_CONNECTION_TRACKER start at 50000.
Update comment that values should be changed after releasing.
Change-Id: I10ed6a0238e4f5be866dd97cfb56c5e7c84ddb52
Adam Powell [Thu, 7 Jul 2011 17:22:27 +0000 (10:22 -0700)]
Action bar layout tweaks
Fix a Spinner issue that reported odd baselines
Fix detection of expandable items for action menus and allocation of cells
Use the right asset for home-as-up in Theme.Holo.Light.SolidActionBar.Inverse
Add TextAppearance.Holo.Widget.ActionBar.Menu as a basis for further
menu item styling
Sync with design for tab/menu text appearance
Change-Id: I32026bbde1cd4e15b6cda30d78d3d48250c84c94
Romain Guy [Thu, 7 Jul 2011 21:10:52 +0000 (14:10 -0700)]
Merge "Add an API to query maximum bitmap/texture size on Canvas."
Romain Guy [Thu, 7 Jul 2011 21:10:06 +0000 (14:10 -0700)]
Add an API to query maximum bitmap/texture size on Canvas.
Change-Id: I2c576c9a4ecad9f33cc6636bcbc29786acdf052d
Jim Miller [Thu, 7 Jul 2011 20:58:13 +0000 (13:58 -0700)]
Merge "Fix
4689527: Update Recents"
Daniel Lehmann [Thu, 7 Jul 2011 20:34:59 +0000 (13:34 -0700)]
Merge "Contacts contract changes for social updates."
James Dong [Thu, 7 Jul 2011 20:34:58 +0000 (13:34 -0700)]
Merge "Add support for some custom YUV420 color formats to recordvideo utility"
Matthew Xie [Sun, 26 Jun 2011 04:47:07 +0000 (21:47 -0700)]
Incoming Bluetooth Connection requests - dialog.
This sends the intents to the Settings app to show
the dialogs for the incoming connection requests.
Includes down merged contributions from Jaikumar Ganesh.
Change-Id: Ic8b857aad3554315aae39a0e871eb94d0ac98a91
Eric Fischer [Thu, 7 Jul 2011 18:33:38 +0000 (11:33 -0700)]
Merge "Import revised translations."
Eric Fischer [Thu, 7 Jul 2011 18:27:19 +0000 (11:27 -0700)]
Import revised translations.
Change-Id: Iad20de7deafae6bfec4c37f23a1fcea35aae5a46
Scott Main [Thu, 7 Jul 2011 18:23:25 +0000 (11:23 -0700)]
am
33f6d634: am
e4e1c3fd: am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
33f6d6347b88d239b16a6b3f28adcb7bf4a61881':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 18:23:22 +0000 (11:23 -0700)]
am
9638fbcf: am
0657e1a7: am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
9638fbcfd2c4449075ead8545a759a4d4dd03a28':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Wink Saville [Thu, 7 Jul 2011 18:22:34 +0000 (11:22 -0700)]
am
19065008: am
48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '
19065008b820ea95530d49cf1894f7481929f8e6':
Reset FAILED ApnContext state to IDLE on data setup triggers
Robert Ly [Thu, 7 Jul 2011 18:22:31 +0000 (11:22 -0700)]
am
6c9d636f: am
027654e9: am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
6c9d636f40477ef3ac44a6e30ac645d708d89002':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Kazuhiro Ondo [Thu, 7 Jul 2011 18:22:10 +0000 (11:22 -0700)]
am
6716ac53: am
c8e2916d: Bring back ERI into CDMA-LTE mode
* commit '
6716ac5342de7e83e5ba47f28aac40a46d1363ac':
Bring back ERI into CDMA-LTE mode
Wink Saville [Thu, 7 Jul 2011 18:05:51 +0000 (11:05 -0700)]
am
5eeeea29: am
97667d0c: Merge "Allow vril-dump to work on user builds" into honeycomb-LTE
* commit '
5eeeea29ecd731897211d31bde7ee87af182420c':
Allow vril-dump to work on user builds
Huahui Wu [Thu, 7 Jul 2011 18:05:13 +0000 (11:05 -0700)]
Merge "b/
3302378 Passes touch pressures, size and timestamps to webkit."
Huahui Wu [Wed, 29 Jun 2011 21:21:58 +0000 (14:21 -0700)]
b/
3302378 Passes touch pressures, size and timestamps to webkit.
Related CL in WebKit:
https://android-git.corp.google.com/g/#change,118422
Change-Id: Ibf209131a6d9ca8186c461b0c5b6286e5f669d0d
James Dong [Thu, 7 Jul 2011 15:30:10 +0000 (08:30 -0700)]
Add support for some custom YUV420 color formats to recordvideo utility
Change-Id: I2f0dfba466efb94b704dca761162d7c7457a43cf
Jeff Sharkey [Thu, 7 Jul 2011 17:23:44 +0000 (10:23 -0700)]
Merge "Temporarily disable socket tagging."
Jeff Sharkey [Thu, 7 Jul 2011 17:22:04 +0000 (10:22 -0700)]
Temporarily disable socket tagging.
Change-Id: Ib4a8babdbbe3ea05057dc930b67c2cac89ac5e42
Scott Main [Thu, 7 Jul 2011 17:17:00 +0000 (10:17 -0700)]
am
e4e1c3fd: am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
e4e1c3fda937d30c9aa75a43c470de6c54a97073':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:14:38 +0000 (10:14 -0700)]
am
0657e1a7: am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
0657e1a7e7d25fee700930252f6b85c3d70bc368':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 7 Jul 2011 17:13:44 +0000 (10:13 -0700)]
am
40afb97c: cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
* commit '
40afb97c3289cd3daae9a31f4829d660ba747d37':
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896 docs: add button builder for android market apps
Scott Main [Thu, 7 Jul 2011 17:10:29 +0000 (10:10 -0700)]
am
77dfe217: cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
* commit '
77dfe2173e2970a6a662b7d9537715c81886185e':
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb docs: update dashboards
Scott Main [Thu, 19 May 2011 01:47:40 +0000 (18:47 -0700)]
cherrypick Change-Id: I51ac719e414ac2794ff446d992bb946acb0fa896
docs: add button builder for android market apps
Change-Id: I0d9da685f850f92737c2d9d3eb758b41dbec0a39
Scott Main [Thu, 7 Jul 2011 16:49:44 +0000 (09:49 -0700)]
cherrypick Change-Id: I2f4c79c5874835bd643b21f7a8ff3649ca27ecfb
docs: update dashboards
Change-Id: Ib37f2b8a3bf8c9c7ae09ea2edbeeb707899abf58
Robert Ly [Thu, 7 Jul 2011 16:54:18 +0000 (09:54 -0700)]
am
f870327d: am
bc45fcbb: am
205d1c34: cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
* commit '
f870327d5dc8a914d0fc55f454b6378f3e504d79':
cherrypicking tools and adt r12 relnotes from hc-mr1 Change-Id: I0ea492417581c062f6433e23345fe3fe398709c0
Jean-Baptiste Queru [Thu, 7 Jul 2011 15:46:09 +0000 (08:46 -0700)]
Merge
37dbfcaf
Change-Id: Iae55ecada8dc231c88bb87b32e8bd5e7b6a47bd0
Adrian Ludwig [Thu, 7 Jul 2011 15:08:13 +0000 (08:08 -0700)]
Merge "Android security code review."
Mathew Inwood [Mon, 4 Jul 2011 14:15:27 +0000 (15:15 +0100)]
SearchBox API to determine if it's supported by the current page.
Change-Id: I0119243ed0e19e237c1f51de887af5c954f96693
Adam Powell [Thu, 7 Jul 2011 06:18:25 +0000 (23:18 -0700)]
Fix bug
5000009 - NPE in Phone UI
Change-Id: I9c5c2c73b340192d754949865b6e4ee4a9a324ff
Adam Powell [Thu, 7 Jul 2011 05:53:11 +0000 (22:53 -0700)]
Add style/theme definitions for solid action bar configurations.
Change-Id: I540e12ad3d8fc779dac24402286d995f542b5d25
Irfan Sheriff [Thu, 7 Jul 2011 05:08:38 +0000 (22:08 -0700)]
Merge "Moved WifiWatchdogService and DnsPinger"
Wink Saville [Thu, 7 Jul 2011 02:05:40 +0000 (19:05 -0700)]
am
48b6d5af: Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
* commit '
48b6d5afae76bec08c5e1194758e6db3e0f8b07c':
Reset FAILED ApnContext state to IDLE on data setup triggers
Wink Saville [Thu, 7 Jul 2011 02:04:30 +0000 (19:04 -0700)]
Merge "Reset FAILED ApnContext state to IDLE on data setup triggers" into honeycomb-LTE
Kazuhiro Ondo [Sat, 2 Jul 2011 18:34:13 +0000 (13:34 -0500)]
Reset FAILED ApnContext state to IDLE on data setup triggers
Make sure FAILED ApnContext state is reset to IDLE regarless of
existence of the reconnect alarm. This is to let FW re-evaluate
call setup conditions properly on data setup triggers.
Bug:
4989604
Change-Id: Ia9ec439db1df03bbd2e56803d3558542ba5f5400
Robert Ly [Thu, 7 Jul 2011 01:19:26 +0000 (18:19 -0700)]
am
027654e9: am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
027654e90da14275fbf076e739e16f89c4fcae2c':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Robert Ly [Thu, 7 Jul 2011 01:17:53 +0000 (18:17 -0700)]
am
ad2724de: cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
* commit '
ad2724de956955b0ddf95491f6cb378f54dafde5':
cherrypicking from hc-mr1 Change-Id: I4f4ccbd73db94070274d4e6195df38b19b2245b8
Elliott Hughes [Thu, 7 Jul 2011 01:11:20 +0000 (18:11 -0700)]
Merge "Add the "debug.jni.logging" property so third-party developers can debug their JNI problems."
Kazuhiro Ondo [Thu, 7 Jul 2011 01:04:30 +0000 (18:04 -0700)]
am
c8e2916d: Bring back ERI into CDMA-LTE mode
* commit '
c8e2916d0bdbbda5fb6faf61d6f24100641d19f5':
Bring back ERI into CDMA-LTE mode