OSDN Git Service
Andrei Stingaceanu [Thu, 14 May 2015 14:27:16 +0000 (14:27 +0000)]
Merge "Fix: text selection bubbles move along with the text" into mnc-dev
Rubin Xu [Thu, 14 May 2015 14:00:16 +0000 (14:00 +0000)]
Merge "clear caller identify before sending system update notification" into mnc-dev
Michael Wright [Thu, 14 May 2015 13:47:07 +0000 (13:47 +0000)]
Merge "Revert "Add new MotionEvent actions for button press and release."" into mnc-dev
Michael Wright [Thu, 14 May 2015 13:46:25 +0000 (14:46 +0100)]
Revert "Add new MotionEvent actions for button press and release."
This reverts commit
ec0ce51b733f10c620cb9447b074f022d042e31d.
Michael Wright [Thu, 14 May 2015 13:31:24 +0000 (13:31 +0000)]
Merge "Add new MotionEvent actions for button press and release." into mnc-dev
Andrei Stingaceanu [Thu, 7 May 2015 15:49:49 +0000 (16:49 +0100)]
Fix: text selection bubbles move along with the text
Always hide the selection cursor when showing the
insertion cursor.
Bug:
19857679
Change-Id: I549552fa5026e60f94900364b8194217e0de4b4a
Michael Wright [Fri, 8 May 2015 19:08:04 +0000 (20:08 +0100)]
Add new MotionEvent actions for button press and release.
Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to
signal a button press or release. If these actions happen
simulanteously with a DOWN or UP event then they're explicitly
ordered to happen after the DOWN or preceding the UP in order to send
them to the most recently targeted view.
Also, introduce new stylus button constants that differ from the
constants we use for mouse buttons.
Bug:
20704355
Change-Id: I5b75e5c5e692171c1c117ee687dd185a0d9dd15c
Rubin Xu [Thu, 14 May 2015 12:48:35 +0000 (13:48 +0100)]
clear caller identify before sending system update notification
Because DeviceAdminReceiver is protected by BIND_DEVICE_ADMIN permission,
in order to send broadcast to it, we need to clear the caller's identity
and call sendBroadcastAsUser() as system.
Bug:
20213644
Change-Id: Icc7b239b9005e286012ade6580ec92a0a57198e0
Wojciech Staszkiewicz [Thu, 14 May 2015 10:27:23 +0000 (10:27 +0000)]
Merge "Pass charset to XmlPullParser.setInput instead of null" into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 10:23:06 +0000 (10:23 +0000)]
Merge "Fix floating toolbar popping frequently after Replace/Copy" into mnc-dev
Narayan Kamath [Thu, 14 May 2015 09:34:07 +0000 (09:34 +0000)]
Merge "Fix build." into mnc-dev
Andrei Stingaceanu [Thu, 14 May 2015 09:33:56 +0000 (09:33 +0000)]
Merge "Fix: replace terminates extract mode (floating toolbar)" into mnc-dev
Chris Banes [Thu, 14 May 2015 09:32:38 +0000 (09:32 +0000)]
Merge "Fix build; doc link in ImageView" into mnc-dev
Clara Bayarri [Thu, 14 May 2015 09:28:45 +0000 (09:28 +0000)]
Merge "Tests for WindowDecorActionBar's startActionMode implementation" into mnc-dev
Narayan Kamath [Thu, 14 May 2015 09:27:41 +0000 (10:27 +0100)]
Fix build.
Broken @link tag in javadoc.
Change-Id: I1452d858eb46c9184903a0110ae645e949db4230
Clara Bayarri [Thu, 7 May 2015 14:18:27 +0000 (15:18 +0100)]
Tests for WindowDecorActionBar's startActionMode implementation
Change-Id: Ib7a79f3987fd565aabf4c5b093186ec669131522
Clara Bayarri [Thu, 14 May 2015 09:25:25 +0000 (09:25 +0000)]
Merge "Tests for ActionBarContainer's startActionModeForChild" into mnc-dev
Clara Bayarri [Wed, 6 May 2015 15:01:57 +0000 (16:01 +0100)]
Tests for ActionBarContainer's startActionModeForChild
Change-Id: Ida782cb72f26689ec49a6674dcaeee7d2fb196d3
Wojciech Staszkiewicz [Fri, 8 May 2015 13:58:46 +0000 (14:58 +0100)]
Pass charset to XmlPullParser.setInput instead of null
Passing null to XmlPullParser.setInput forces it to do additional
work, which can be easily avoided if we know the charset beforehand.
bug: b/
20849543
Change-Id: Iaff97be9df2d0f99d7af8f19f65934439c9658e2
Chris Banes [Thu, 14 May 2015 09:12:20 +0000 (10:12 +0100)]
Fix build; doc link in ImageView
Change-Id: Ie3057fc2b920f71ff89eee0d3577d21d0e9930c3
Geoff Mendal [Thu, 14 May 2015 08:58:50 +0000 (08:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:58:19 +0000 (08:58 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:57:55 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:57:40 +0000 (08:57 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 08:56:14 +0000 (01:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0096104dd65eeb3b4e7bf836c09a58f8aa34965e
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:52:48 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I39f1448a0cead40a7deadb7769eb14dea658bf0a
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:25:41 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I67b89c7404834f90bd632fdb0fa400187902a0f1
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 08:22:15 +0000 (01:22 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2fd493c8a9420bd2a42011ff69301d2ef0375523
Auto-generated-cl: translation import
Robin Lee [Tue, 5 May 2015 14:57:17 +0000 (15:57 +0100)]
Replace String host:port/url args with Uri arg
Uri provides a stronger guarantee of well-formedness and lets apps do
nice extra things like specifying scheme etc. without twisting any
expectations.
Bug:
20820034
Change-Id: Ia6bbedb74765444920b667d643fb7e1eb6a7292b
Deepanshu Gupta [Thu, 14 May 2015 05:21:19 +0000 (05:21 +0000)]
Merge "Fix build." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 05:18:37 +0000 (22:18 -0700)]
Fix build.
When doing the full build, javalib.jar wasn't created. However, mm had
created the javalib.jar. Fix the build by not depending on javalib.jar,
but on classes.jar
Change-Id: I643676b1d73cbfce42946a065a2ada6c50cc959a
Deepanshu Gupta [Thu, 14 May 2015 04:53:00 +0000 (04:53 +0000)]
Merge "Update rendering fidelity tag to use constant." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:56 +0000 (04:52 +0000)]
Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 04:52:31 +0000 (04:52 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:11 +0000 (04:52 +0000)]
Merge "Use Balanced line breaker instead of HighQuality." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:52:01 +0000 (04:52 +0000)]
Merge "Update nav bar icons." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:56 +0000 (04:51 +0000)]
Merge "Load ICU data in LayoutLib" into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:35 +0000 (04:51 +0000)]
Merge "Add missing delegates for M preview." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:23 +0000 (04:51 +0000)]
Merge "Run setup for full tests only once." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:51:14 +0000 (04:51 +0000)]
Merge "Remove kxml dependency." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:47:10 +0000 (21:47 -0700)]
Update rendering fidelity tag to use constant.
Change-Id: If6c1076aa1e070c6bda7be16516fe0e18a95fe2d
Geoff Mendal [Thu, 14 May 2015 04:44:23 +0000 (21:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I74bbf76bccf8567fe859e3ee4d0884b1306fc7e2
Auto-generated-cl: translation import
Geoff Mendal [Thu, 14 May 2015 04:36:17 +0000 (04:36 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 04:28:40 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: If33561fdaf98e273425caa3c0e9da3cf81446886
Auto-generated-cl: translation import
Keisuke Kuroyanagi [Thu, 14 May 2015 04:26:20 +0000 (04:26 +0000)]
Merge "Track difference between touch and word in x coordinate." into mnc-dev
Deepanshu Gupta [Thu, 14 May 2015 04:25:57 +0000 (21:25 -0700)]
Revert "Call dispatchFinishTemporaryDetach before returning a transient view"
This reverts commit
c73a1aaa90694c66feefc59557b35f5913ef1b04. The change
causes an NPE when rendering ListViews.
Deepanshu Gupta [Thu, 14 May 2015 03:53:14 +0000 (20:53 -0700)]
Use Balanced line breaker instead of HighQuality.
Fallback to the Balanced line breaker till the time HighQuality one is
implemented.
Change-Id: I51e9882c5c733e5409f932ef740684829340ced9
Dan Sandler [Wed, 6 May 2015 19:18:49 +0000 (15:18 -0400)]
Icon support comes to Notification.
And you may ask yourself: what is that beautiful icon?
And you may ask yourself: where does that API go to?
And you may ask yourself: is it a resource? is it a Bitmap?
And you may say to yourself: my god, what have I done
Bug:
18568715
Change-Id: I4377b311c538bd1cf36b3fba22326bae81af40c9
Dan Sandler [Wed, 13 May 2015 04:12:47 +0000 (00:12 -0400)]
Add Icon support to ImageView.
ImageView.setImageIcon() is remotable, so you can also call
RemoteViews.setImageViewIcon().
Bug:
18568715
Change-Id: I456cfa65102e1983d3392d822584d154a6cd761a
Deepanshu Gupta [Wed, 13 May 2015 23:56:42 +0000 (16:56 -0700)]
Update nav bar icons.
- Add a script to copy the icons from the original source.
- Update layout used for the navigation bar to be closer to the original
layout.
- Update test image with the latest rendering.
- Add a nexus 5 landscape device config to help with testing.
Change-Id: I0b6674955e0970a6a8cce148b1b7aa61e1752ccd
Geoff Mendal [Thu, 14 May 2015 03:48:13 +0000 (03:48 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Thu, 14 May 2015 03:47:17 +0000 (20:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie70f9077c3e51b08528ca37c3614b065ab44c68b
Auto-generated-cl: translation import
Vinit Deshpande [Thu, 14 May 2015 03:39:45 +0000 (03:39 +0000)]
Merge "fix null pointer crash" into mnc-dev
Lorenzo Colitti [Thu, 14 May 2015 03:25:20 +0000 (03:25 +0000)]
Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev
Jean-Michel Trivi [Thu, 14 May 2015 03:21:54 +0000 (03:21 +0000)]
Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev
Jeff Brown [Thu, 14 May 2015 02:52:08 +0000 (02:52 +0000)]
Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev
Sanket Padawe [Thu, 14 May 2015 02:40:36 +0000 (02:40 +0000)]
Merge "Hotspot 2.0 UI." into mnc-dev
Jean-Michel Trivi [Thu, 14 May 2015 02:03:21 +0000 (19:03 -0700)]
AudioTrack in SoundPool uses audio_attributes_t parameter
Bug
20731155
Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
Andy Hung [Thu, 14 May 2015 02:18:01 +0000 (02:18 +0000)]
Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev
Pierre Vandwalle [Fri, 8 May 2015 23:07:04 +0000 (16:07 -0700)]
fix null pointer crash
(cherry-picked from mirror-m-wireless-internal-release
216d8c3 fix null pointer crash)
Bug:
20232584
Change-Id: I7c46e372bc8f3a54b0428ef56c034eb2c79133ea
Jaesung Chung [Thu, 14 May 2015 02:14:36 +0000 (02:14 +0000)]
Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev
Santos Cordon [Thu, 14 May 2015 02:10:33 +0000 (02:10 +0000)]
Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev
Santos Cordon [Thu, 14 May 2015 01:47:38 +0000 (18:47 -0700)]
Improve javadoc for PRESENTATION_ constants.
Bug:
21089678
Change-Id: I045fd71a30c75c213dd5c0c64ded983ea5e5d866
Santos Cordon [Thu, 14 May 2015 02:07:52 +0000 (02:07 +0000)]
Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev
Yorke Lee [Thu, 14 May 2015 02:06:52 +0000 (02:06 +0000)]
Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev
Svetoslav [Thu, 14 May 2015 02:04:27 +0000 (02:04 +0000)]
Merge "Do not allow opting out from the new permission model." into mnc-dev
Jaesung Chung [Fri, 24 Apr 2015 10:39:59 +0000 (19:39 +0900)]
TIF: Add DVB device handling to TvInputManagerService
Added an API to pass an open file descriptor of DVB devices and
addressed the security issue of setting the permissions on DVB devices
to 0666.
Bug:
20436120
Change-Id: I4649e76084f3356ec22b7e776fb87c6a8fdc00d6
Svetoslav [Thu, 14 May 2015 01:02:46 +0000 (18:02 -0700)]
Do not allow opting out from the new permission model.
bug:
20525775
Change-Id: I84cd4587db5adb96f6f29148adb242905f53f2dc
Wale Ogunwale [Thu, 14 May 2015 01:51:49 +0000 (01:51 +0000)]
Merge "Don't stop animation when starting windows app token changes" into mnc-dev
Wale Ogunwale [Wed, 13 May 2015 22:27:12 +0000 (15:27 -0700)]
Don't stop animation when starting windows app token changes
If another activity is starting while we are still animating
the starting window of the previous activity to start, we
transfer the starting window of the old activity to the one that
is currently starting so we don't have to create another starting
window and also to reduce jank from the starting window animation
appearing to restart.
However, there were several conditions that led to the starting
window animation stopping when the transfers app tokens
1. Starting window animator not been removed from the previous
app token animator causing it to finish/remove the starting window
prematurily.
2. Starting window animator not been properly added to the new
app token animator causing the animation not be be picked up.
3. WMS.mSkipAppTransitionAnimation been set to false regardless of if
an app transition was actually prepared in WMS.prepareAppTransition()
4. WMS.mSkipAppTransitionAnimation not been set to true in all cases
where the starting window transfers tokens even though we don't want the
new app to do any transition animation is the starting window is
animating.
5. New app not setting its animation to dummy animation when the next
transition should be skipped due to starting window still animating.
6. Starting window animation been cleared for the new app in
WMS.handleAppTransitionReadyLocked() even for cases where we transferred
the animation from the previous app.
Also, cleaned up some code.
Bug:
20953232
Change-Id: I714d6bdfcdaeeaac29f9d464bab9f3e9c192e937
Mikhail Naganov [Thu, 14 May 2015 01:43:45 +0000 (01:43 +0000)]
Merge "Update the new error reporting API in android.webkit" into mnc-dev
Mikhail Naganov [Wed, 13 May 2015 00:44:15 +0000 (17:44 -0700)]
Update the new error reporting API in android.webkit
- minor changes in WebResourceError;
- prepare to remove WebResourceResponseBase;
- add immutable mode to WebResourceResponse.
Bug:
21063767
Change-Id: Iaf5f92e3850732c7a888453468e108809b3b782a
Andy Hung [Thu, 14 May 2015 01:25:48 +0000 (18:25 -0700)]
Add getChannelIndexMasks API to AudioDeviceInfo
Fix some javadoc as well.
Bug:
21129531
Change-Id: I82e5b66f254f6acdcd93638eeed878b4c5b5be34
Amith Yamasani [Thu, 14 May 2015 01:24:28 +0000 (01:24 +0000)]
Merge "Allow settings to change app inactive state" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 01:21:56 +0000 (01:21 +0000)]
Merge "Add IntentFilter auto verification - part 11" into mnc-dev
Amith Yamasani [Thu, 14 May 2015 01:21:09 +0000 (18:21 -0700)]
Allow settings to change app inactive state
Change-Id: I57efb4b5fa69c9a268025fb1ef83de36c4cc83ca
Yorke Lee [Thu, 14 May 2015 01:21:06 +0000 (01:21 +0000)]
Merge "Rename AudioState to CallAudioState" into mnc-dev
Fabrice Di Meglio [Thu, 14 May 2015 01:17:12 +0000 (18:17 -0700)]
Add IntentFilter auto verification - part 11
- tune Intent resolution candidates filtering: add also the undefinedList
into the results at first so that when you install an App which is not
verified (after installing a verified App) you will still have the
Disambiguation Dialog prompted to the User.
See bug #
19628271
Change-Id: I611fff4c1c7f60db22312d7948c8d5120719fbd0
Deepanshu Gupta [Wed, 13 May 2015 21:58:15 +0000 (14:58 -0700)]
Load ICU data in LayoutLib
Also return the correct version numbers for ICU data.
Change-Id: I7de973b5553c73948870b97bdc12a880bb2fdd85
Deepanshu Gupta [Tue, 12 May 2015 19:01:16 +0000 (12:01 -0700)]
Add missing delegates for M preview.
- Remove ICU dependency (use the version bundled with platform).
- Restructure intelliJ project to move dependencies to module.
- Minor fixes to layoutlib tests.
TODO:
- Load ICU data.
- Hyphenator doesn't work.
- High quality line breaker not present.
Change-Id: I965e096e17bfc97ee995a649c3f4f6f64bb4f70d
Deepanshu Gupta [Sat, 9 May 2015 20:33:55 +0000 (13:33 -0700)]
Run setup for full tests only once.
Change-Id: Iee64dbd88d473b7be08581f26ccddf649aed8e56
Deepanshu Gupta [Sat, 9 May 2015 20:09:22 +0000 (13:09 -0700)]
Remove kxml dependency.
Create XmlPullParser using callback provided by the client. This enables
clients to choose which XmlPullParser implementation they want.
Change-Id: I9ad97a4777820cdbe5c8fc3716f74ddec9065c70
Jason Monk [Thu, 14 May 2015 01:02:12 +0000 (01:02 +0000)]
Merge "Add QS Tuner" into mnc-dev
Jason Monk [Tue, 12 May 2015 23:29:02 +0000 (19:29 -0400)]
Add QS Tuner
Change-Id: I908d0161b7209b8e99299f5cb3eb58f3d7b52752
Dianne Hackborn [Wed, 13 May 2015 21:03:20 +0000 (14:03 -0700)]
Ignore small time changes in alarm manager.
It turns out switching to the new kernel alarm
reporting causes lots and lots of spurious flags
that the clock has changed. The alarm manager
would blindly trust these, thinking the world has
changed on it and recomputing everything and reporting
this to everyone else. This was expensive.
We now verify that the time has changed sufficiently
that it is worth caring about. This is basically the
same algorithm that battery stats was using to avoid
recording small clock changes, so we are really just
pushing this down into the alarm manager and can now
remove that from battery stats.
Also since we are getting these so much, make use of
the other information in about the wakeup that tells us
if an alarm went off to avoid doing anything if it didn't.
Change-Id: I6f4f4226db6eb2b38ca73860786e7cf7c9136cc3
John Reck [Thu, 14 May 2015 00:38:28 +0000 (00:38 +0000)]
am
7238435e: (-s ours) resolved conflicts for merge of
e869835d to lmp-mr1-ub-dev
* commit '
7238435e9b3f133965b63abc7b352b34f9401af5':
DO NOT MERGE Backport of limited jank-tracking metrics
Dianne Hackborn [Thu, 14 May 2015 00:36:56 +0000 (00:36 +0000)]
Merge "Fix build." into mnc-dev
Jorim Jaggi [Thu, 14 May 2015 00:36:02 +0000 (00:36 +0000)]
Merge "Fix fingerprint for multiuser" into mnc-dev
Dianne Hackborn [Thu, 14 May 2015 00:35:42 +0000 (17:35 -0700)]
Fix build.
Change-Id: I94c7e3033721c1d8024a212614752512e685289b
Andy Hung [Thu, 14 May 2015 00:21:23 +0000 (00:21 +0000)]
Merge "Allow partial playback parameter settings in AudioTrack" into mnc-dev
John Reck [Thu, 14 May 2015 00:16:31 +0000 (17:16 -0700)]
resolved conflicts for merge of
e869835d to lmp-mr1-ub-dev
Change-Id: Ia183cafb1aa19dcbb6e3bbefceecec5df29663da
Robert Greenwalt [Thu, 14 May 2015 00:06:57 +0000 (00:06 +0000)]
Merge "Add support for static RadioCapabilities." into mnc-dev
Robert Greenwalt [Tue, 12 May 2015 00:54:13 +0000 (17:54 -0700)]
Add support for static RadioCapabilities.
Some RILs don't support RIL_REQUEST_GET_RADIO_CAPABILITY. Add
code to RIL.java to notice a REQUEST_NOT_SUPPORTED response and
check config.xml (config_radio_access_family) for a static answer.
Also catching GENERIC_FAILURE responses because Hammerhead modem
returns that. B
21079604 created for this.
If neither Modem nor config.xml provide data, uses RAF_UNKNOWN
so we don't lie about capabilities and also so we fail fast
(setPreferredNetwork won't work).
bug:
20561357
Change-Id: I49e4527fe94919a7094bc7c1e100d20e8f833865
David Friedman [Thu, 14 May 2015 00:00:10 +0000 (00:00 +0000)]
am
3ccf0caf: am
7fc3b6c0: am
abd8d422: am
f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
* commit '
3ccf0caf015034976f8c654d89ac74619aa94bd0':
Docs: NDK r10e changes to publish to DAC.
Santos Cordon [Wed, 13 May 2015 18:17:25 +0000 (11:17 -0700)]
[1/4] Use new Icon class in PhoneAccount.
Bug:
21088522
Change-Id: Ia03171d4861f758701e89733f4082863587e8c11
Chris Craik [Wed, 13 May 2015 23:53:47 +0000 (23:53 +0000)]
Merge "Add back alpha atrace log" into mnc-dev
Chris Craik [Wed, 13 May 2015 23:33:04 +0000 (16:33 -0700)]
Add back alpha atrace log
bug:
20922838
Change-Id: I70ccbffdd5f140cd1dd71fbf456fb5b085e74a4a
David Friedman [Wed, 13 May 2015 23:46:36 +0000 (23:46 +0000)]
am
7fc3b6c0: am
abd8d422: am
f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs
* commit '
7fc3b6c00b55e15881d1f098666399b674a64e42':
Docs: NDK r10e changes to publish to DAC.
Svet Ganov [Wed, 13 May 2015 23:45:22 +0000 (23:45 +0000)]
Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev
Robert Shih [Wed, 13 May 2015 23:36:47 +0000 (23:36 +0000)]
Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev