OSDN Git Service
Deepanshu Gupta [Thu, 16 Apr 2015 18:18:41 +0000 (11:18 -0700)]
resolved conflicts for merge of
186fe7b1 to master
Change-Id: I60886d3e44ae23a11c8f129517df87ee29625ada
Hiroshi Yamauchi [Thu, 16 Apr 2015 17:58:39 +0000 (17:58 +0000)]
Merge "Unhide Debug.getRuntimeStat()."
Santos Cordon [Thu, 16 Apr 2015 17:58:15 +0000 (17:58 +0000)]
Merge "Move Phone.java APIs into InCallService"
Deepanshu Gupta [Thu, 16 Apr 2015 17:55:03 +0000 (17:55 +0000)]
am
c4affce9: am
1f3c7f3f: am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
c4affce9df0817b84df3e61c3932f53b77ee0986':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Santos Cordon [Wed, 15 Apr 2015 18:05:16 +0000 (11:05 -0700)]
Move Phone.java APIs into InCallService
This change is one step in the right direction of getting rid of
Phone.java.
Phone.java was deemed superfluous and this change moves the methods
previously exposed in Phone.java into InCallService. This was done by
having InCallService listen to Phone and pipe the calls as appropriate.
However, state still lives in Phone and we eventually want to move that
code into InCallService. That will be done in a later CL.
Bug:
20160495
Change-Id: Id142431c253c1f24f260da42e8bedd1eb2ce448b
Brian Carlstrom [Thu, 16 Apr 2015 17:53:43 +0000 (17:53 +0000)]
am
81d0aabc: am
40955edf: am
14a982aa: Merge "Document hprof-conv -z"
* commit '
81d0aabcb5af11f8695793dbfac893d17688970e':
Document hprof-conv -z
Deepanshu Gupta [Thu, 16 Apr 2015 17:41:54 +0000 (17:41 +0000)]
am
1f3c7f3f: am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
1f3c7f3f500bdbfd790c20872961d84ef617f066':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:41:44 +0000 (17:41 +0000)]
am
40955edf: am
14a982aa: Merge "Document hprof-conv -z"
* commit '
40955edf9dc1e90b337af89543919eec4868dbe0':
Document hprof-conv -z
Brian Carlstrom [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
14a982aa: Merge "Document hprof-conv -z"
* commit '
14a982aa7a38fa89c916c252996632d401b1d043':
Document hprof-conv -z
Deepanshu Gupta [Thu, 16 Apr 2015 17:31:34 +0000 (17:31 +0000)]
am
f18ceefc: am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
f18ceefcf0d3cc91e74737e0a93f16775e3bf18b':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Alex Klyubin [Thu, 16 Apr 2015 17:20:37 +0000 (17:20 +0000)]
am
f39aa3d0: am
a2607ee4: am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
f39aa3d0898b845ced3128f1778fd04171e4b9a6':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 17:20:23 +0000 (17:20 +0000)]
am
22b5d9b9: am
28a9089f: am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
22b5d9b969176a196b0b29ce9441ac3d1d35d208':
Remove IV auto-generation workaround.
Deepanshu Gupta [Thu, 16 Apr 2015 17:19:42 +0000 (17:19 +0000)]
am
cd6e00c6: Merge changes from topic \'layoutlib-api-15\' into lmp-mr1-dev
* commit '
cd6e00c6d973af350f4bb0de5d85fed7e299d9e8':
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Deepanshu Gupta [Thu, 16 Apr 2015 17:12:41 +0000 (17:12 +0000)]
Merge changes from topic 'layoutlib-api-15' into lmp-mr1-dev
* changes:
Update golden image for tests.
Update to using LayoutlibCallback.
Remove implementation of deprecated method.
Add @empty support.
Brian Carlstrom [Thu, 16 Apr 2015 17:07:58 +0000 (17:07 +0000)]
Merge "Document hprof-conv -z"
Alex Klyubin [Thu, 16 Apr 2015 17:07:51 +0000 (17:07 +0000)]
am
a2607ee4: am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
a2607ee4ebef49f88b5656e2eca2db362b32c70d':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 17:07:47 +0000 (17:07 +0000)]
am
28a9089f: am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
28a9089f5b79e20ca5b023830255cf438a9cded7':
Remove IV auto-generation workaround.
Brian Carlstrom [Fri, 27 Mar 2015 05:41:45 +0000 (22:41 -0700)]
Document hprof-conv -z
Bug:
18473132
Change-Id: I3c0fcc2c15d4c590ed852f41aa4fd2a2531a6db8
Chris Watkins [Thu, 16 Apr 2015 17:06:37 +0000 (17:06 +0000)]
Merge "Unhide the android.media.[Media]DataSource interface."
Yorke Lee [Thu, 16 Apr 2015 17:05:16 +0000 (17:05 +0000)]
Merge "Change hasVoicemailNumber to getVoicemailNumber"
Alex Klyubin [Thu, 16 Apr 2015 16:57:12 +0000 (16:57 +0000)]
am
b9a78c79: Merge "Add IV-related Keymaster error codes."
* commit '
b9a78c7939e9b31c807106166cafe65dc5af777d':
Add IV-related Keymaster error codes.
Alex Klyubin [Thu, 16 Apr 2015 16:57:05 +0000 (16:57 +0000)]
am
216d18b9: Merge "Remove IV auto-generation workaround."
* commit '
216d18b997eb929c2c3af9b2102595f4ec694c20':
Remove IV auto-generation workaround.
Mady Mellor [Thu, 16 Apr 2015 16:55:06 +0000 (16:55 +0000)]
Merge "New listener to recognize stylus button press gesture in GestureDetector"
Mady Mellor [Thu, 16 Apr 2015 16:54:40 +0000 (16:54 +0000)]
Merge "Recognize stylus touch + press button as a longpress in AbsListView"
Ben Kwa [Thu, 16 Apr 2015 16:45:27 +0000 (16:45 +0000)]
Merge "Fix cancellation of copy jobs."
Ben Kwa [Wed, 15 Apr 2015 19:13:32 +0000 (12:13 -0700)]
Fix cancellation of copy jobs.
Add FLAG_CANCEL_CURRENT to the pending intent for cancellation, to
prevent reuse of previously created cancellation intents. Previously
created intents have non-matching job IDs, which causes the cancellation
intent to be ignored.
BUG=
20221969
Change-Id: Ie0afcc6af53a550b44bc4b2f3d48942cdb092a65
Alex Klyubin [Thu, 16 Apr 2015 16:39:30 +0000 (16:39 +0000)]
Merge "Add IV-related Keymaster error codes."
Alex Klyubin [Thu, 16 Apr 2015 16:39:07 +0000 (16:39 +0000)]
Merge "Remove IV auto-generation workaround."
Yorke Lee [Wed, 15 Apr 2015 23:14:22 +0000 (16:14 -0700)]
Change hasVoicemailNumber to getVoicemailNumber
Bug:
20223485
Change-Id: I67eb12e2030ec8f73326ade4eb750b0c2f6e52ad
Lorenzo Colitti [Thu, 16 Apr 2015 16:11:15 +0000 (16:11 +0000)]
Merge changes from topic 'wifi-alternate-reality'
* changes:
Pin a process to wifi when it calls enableNetwork(..., true)
Make CALLBACK_PRECHECK actually work.
Robert Greenwalt [Thu, 16 Apr 2015 15:28:03 +0000 (15:28 +0000)]
Merge "LCE service implementation - connectivity side"
Lorenzo Colitti [Wed, 8 Apr 2015 14:52:39 +0000 (23:52 +0900)]
Pin a process to wifi when it calls enableNetwork(..., true)
Bug:
20081183
Change-Id: I12bbda1061bbebeb4d0844d0b0d7f51237645958
John Spurlock [Thu, 16 Apr 2015 15:10:31 +0000 (15:10 +0000)]
Merge "Volume: Automute in seek bar volumizer."
John Spurlock [Thu, 16 Apr 2015 15:01:15 +0000 (11:01 -0400)]
Volume: Automute in seek bar volumizer.
Never disable the slider, allow mutebusting and syncing mute to 0
value.
Also add new framework icon for media.
Bug:
20096341
Change-Id: I9db1671c3442365866a49c9d6f7becf0b2e05435
John Reck [Thu, 16 Apr 2015 14:29:20 +0000 (14:29 +0000)]
Merge "Remove Bitmap#getSkBitmap"
Andrew Flynn [Thu, 16 Apr 2015 13:15:00 +0000 (13:15 +0000)]
Merge "SysUI: Carrier Network Change icon"
Geoff Mendal [Thu, 16 Apr 2015 12:54:43 +0000 (05:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib81a9725011568bacb0250dac5a59b50450209fc
Auto-generated-cl: translation import
Andrew Flynn [Wed, 15 Apr 2015 03:33:45 +0000 (23:33 -0400)]
SysUI: Carrier Network Change icon
- Listen for new PhoneStateListener.CARRIER_NETWORK_CHANGE events.
- Show/hide a new unique animated icon in status bar and quick settings during
Carrier Network Change events if we are instructed by PhoneStateListener
and it's during a period without connectivity.
- ObjectAnimator doesn't let you animate colors between themed colors, so
there's quite a bit of boilerplate duplication in the animation xml.
- Add a new demo mode command to toggle it on/off.
Change-Id: Ic5bb2aa7444303c6b7f2456526a9c25325c6e1f4
Abodunrinwa Toki [Thu, 16 Apr 2015 10:53:07 +0000 (10:53 +0000)]
Merge "Style floating toolbar."
Clara Bayarri [Thu, 16 Apr 2015 10:14:35 +0000 (10:14 +0000)]
Merge "Editor: keep text selection when starting a process text intent."
Gustav Sennton [Thu, 16 Apr 2015 10:13:58 +0000 (10:13 +0000)]
Merge "Load WebView from one out of a list of packages."
John Spurlock [Thu, 16 Apr 2015 10:04:00 +0000 (06:04 -0400)]
Mark sysui string reference as untranslatable.
Bug:
19260237
Change-Id: I4a2267462ece1d21ced0156cb1e99be913ea2ada
fenglu [Fri, 20 Mar 2015 18:29:56 +0000 (11:29 -0700)]
LCE service implementation - connectivity side
Change-Id: If11bd99c44c7dc8d2aa2bc05a10e04421739baa6
Lorenzo Colitti [Thu, 9 Apr 2015 05:35:26 +0000 (14:35 +0900)]
Make CALLBACK_PRECHECK actually work.
Currently, CALLBACK_PRECHECK is never fired, because we attempt
to send it just after a network has connected, before matching
requests to that network. So notifyNetworkCallbacks scans the
list of requests for the network, finds none, and does nothing.
Bug:
20038463
Change-Id: Ib0c6377c45990e358f926217d7c7defa74c1d59b
Yorke Lee [Wed, 15 Apr 2015 18:55:20 +0000 (11:55 -0700)]
Fix make update-api
Change-Id: Iaee002c64096fbd6ba05d6484cc50840146a4af0
Casper Bonde [Thu, 19 Mar 2015 09:36:45 +0000 (10:36 +0100)]
Add support for Bluetooth Sim Access Profile (2/4)
Change-Id: I6c634aa38d31a7b5a98c9089840557257fd58209
Nitin Arora [Mon, 2 Mar 2015 23:03:51 +0000 (15:03 -0800)]
Bluetooth LE background operation mode (2/2)
Changes include new framework APIs to enable and disable Bluetooth LE
separately from Bluetooth Classic. Along with handling the new states
in the Bluetooth manager service.
Change-Id: Idf667981f48fcbcb6dfda1aa77ea8bab1b2361f0
Jeff Sharkey [Thu, 16 Apr 2015 05:50:13 +0000 (05:50 +0000)]
Merge "Candidate volumes for packages, fix symlink."
Jeff Sharkey [Thu, 16 Apr 2015 00:14:12 +0000 (17:14 -0700)]
Candidate volumes for packages, fix symlink.
Add API to determine the possible candidate volumes that a package
can be moved to. For example, it currently knows that we need to
move ASEC-based apps through internal storage before migrating them
to a private volume.
Comparator for consistent VolumeInfo ordering when displayed in UI.
Fix native library symlink to be volume UUID aware.
Bug:
19993667
Change-Id: I68d5fac5f0f776ac1c7dd15e7a984bfe2704f3f7
Vinit Deshpande [Thu, 16 Apr 2015 04:43:18 +0000 (04:43 +0000)]
Merge "TelephonyManager Carrier Network Change Notification"
Daichi Hirono [Thu, 16 Apr 2015 03:34:33 +0000 (03:34 +0000)]
Merge "DocumentsUI: Hide pick button of copy destination picker for read only directory."
Adam Lesinski [Thu, 16 Apr 2015 03:31:24 +0000 (03:31 +0000)]
Merge "Fix up the command line, add flags."
Adam Lesinski [Thu, 16 Apr 2015 03:29:22 +0000 (20:29 -0700)]
Fix up the command line, add flags.
Change-Id: I420bd0212fc7541668bd095b88295564d3d11f6c
Wei Jia [Thu, 16 Apr 2015 03:05:36 +0000 (03:05 +0000)]
Merge "MediaSync: pass the error code of setPlaybackRate from native code to JAVA."
Adam Lesinski [Thu, 16 Apr 2015 03:04:41 +0000 (03:04 +0000)]
Merge "AAPT2: Add library support"
Adam Lesinski [Sat, 11 Apr 2015 02:43:55 +0000 (19:43 -0700)]
AAPT2: Add library support
Change-Id: I307f56d9631784ab29ee4156d94886f9b2f25b30
Miao Wang [Thu, 16 Apr 2015 02:46:43 +0000 (02:46 +0000)]
am
13391109: am
2b300a99: am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
133911095ce0d9ef01766aa7b67a0a31b852e242':
[RenderScript] typo fix in Allocation.java
Vinit Deshpande [Thu, 16 Apr 2015 02:36:02 +0000 (02:36 +0000)]
Merge "am
b5e0cfb..
557d2f5 from mirror-m-wireless-internal-release"
Miao Wang [Thu, 16 Apr 2015 02:32:59 +0000 (02:32 +0000)]
am
2b300a99: am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
2b300a99bbb133090b7ec39e64dd65ba2bb8f18d':
[RenderScript] typo fix in Allocation.java
Miao Wang [Thu, 16 Apr 2015 02:21:37 +0000 (02:21 +0000)]
am
782b4339: Merge "[RenderScript] typo fix in Allocation.java"
* commit '
782b43394ef48e7cf8e75404c534a46074d42d4e':
[RenderScript] typo fix in Allocation.java
Miao Wang [Thu, 16 Apr 2015 02:03:26 +0000 (02:03 +0000)]
Merge "[RenderScript] typo fix in Allocation.java"
Raph Levien [Thu, 16 Apr 2015 02:00:02 +0000 (02:00 +0000)]
Merge "Add left and right indent arrays to TextView"
Raph Levien [Wed, 15 Apr 2015 06:51:07 +0000 (23:51 -0700)]
Add left and right indent arrays to TextView
In support of layout of paragraphs to non-rectangular regions, add
arrays for left and right indents to TextView, along with supporting
StaticLayout builder setters.
Bug:
20182243
Change-Id: I015bcef8f258c89001fcf8a54c179d2dfc0d7943
Adrian Roos [Thu, 16 Apr 2015 01:50:21 +0000 (01:50 +0000)]
Merge "Fix lockscreen bugs with SHOW_WHEN_LOCKED"
Adrian Roos [Thu, 16 Apr 2015 01:03:08 +0000 (18:03 -0700)]
Fix lockscreen bugs with SHOW_WHEN_LOCKED
When unlocking to a SHOW_WHEN_LOCKED activity by clicking
a notification, we don't get a the startKeyguardExitAnimation
because Keyguard is not actually going away. Instead, we start
it ourselves.
Also fixes the bug where restarting Keyguard while it's occluded
lead to an inconsistent state where the user got stuck on the
lockscreen.
Bug:
16481924
Change-Id: Iebc5bdd1287bbb81415ae01c7428850acc16c53f
Zheng Fu [Thu, 16 Apr 2015 01:35:39 +0000 (01:35 +0000)]
Merge "Add setting flag to enable contact metadata syncing in CP2"
Deepanshu Gupta [Wed, 15 Apr 2015 00:26:09 +0000 (17:26 -0700)]
Update golden image for tests.
Change-Id: If07edcbfb7016a6b80f4bd00cffab494f74bfc03
Deepanshu Gupta [Tue, 14 Apr 2015 23:39:41 +0000 (16:39 -0700)]
Update to using LayoutlibCallback.
Change-Id: Ia89d418b0d40ca8efef8968a4a2a635616b945ac
Deepanshu Gupta [Tue, 14 Apr 2015 22:17:07 +0000 (15:17 -0700)]
Remove implementation of deprecated method.
BridgeResources.getDrawable(int) is not needed anymore, since the super
method is deprecated and it calls the alternative
getDrawable(int, Theme), which we override.
Change-Id: I00c0bfaef6c4167a787bb74990b91cebb951c847
Deepanshu Gupta [Mon, 30 Mar 2015 21:53:38 +0000 (14:53 -0700)]
Add @empty support.
Bug: http://b.android.com/162428
Change-Id: Id7a981de2fce21213e12cdabcce4104f146fd4d3
John Spurlock [Thu, 16 Apr 2015 01:19:26 +0000 (01:19 +0000)]
Merge "Zen: Add notification policy management api."
Wale Ogunwale [Thu, 16 Apr 2015 01:17:58 +0000 (01:17 +0000)]
Merge "Updated javadoc for persistRootOnly attribute."
Andres Morales [Thu, 16 Apr 2015 01:08:42 +0000 (01:08 +0000)]
Merge "Make CryptoObject constructor public"
Wei Jia [Wed, 15 Apr 2015 20:24:35 +0000 (13:24 -0700)]
MediaSync: pass the error code of setPlaybackRate from native code to JAVA.
Bug:
19666434
Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
Ronghua Wu [Thu, 16 Apr 2015 01:04:32 +0000 (01:04 +0000)]
Merge "media: add reason to CodecException ctor."
Ronghua Wu [Thu, 16 Apr 2015 00:10:31 +0000 (17:10 -0700)]
media: add reason to CodecException ctor.
Bug:
19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
Miao Wang [Thu, 16 Apr 2015 00:44:32 +0000 (17:44 -0700)]
[RenderScript] typo fix in Allocation.java
Change-Id: Id0eae76387d18c5bfed6cdbb52781b0dc3e4ae90
Craig Mautner [Thu, 16 Apr 2015 00:37:37 +0000 (00:37 +0000)]
Merge "Fix build."
Jason Sams [Thu, 16 Apr 2015 00:35:22 +0000 (00:35 +0000)]
Merge "Hide array allocation"
Jorim Jaggi [Thu, 16 Apr 2015 00:32:42 +0000 (17:32 -0700)]
Make CryptoObject constructor public
Change-Id: I9bfedd5113af7b4717194d99c7c9898753ea2ebd
Alex Klyubin [Thu, 16 Apr 2015 00:20:23 +0000 (17:20 -0700)]
Remove IV auto-generation workaround.
This workaround prevents use of keys with randomized encryption
(IND-CPA). Since randomized encryption is on by default, it's better
to keep it working and break non-randomized encryption (until
Keymaster is fixed).
Bug:
18088752
Change-Id: I4b11ce72cff705be41d3e66f28b507d6ddc1da79
Yoshiki Iguchi [Thu, 16 Apr 2015 00:18:53 +0000 (00:18 +0000)]
Merge "TextView.extractText should not crash with null arguments"
Alex Klyubin [Thu, 16 Apr 2015 00:16:23 +0000 (17:16 -0700)]
Add IV-related Keymaster error codes.
Bug:
18088752
Change-Id: I08daede713f945ad7dd0b21cc41ee12c15d94bad
Jason Sams [Thu, 16 Apr 2015 00:18:10 +0000 (17:18 -0700)]
Hide array allocation
Not done for feature complete
Change-Id: I79c8da2c7e64d6feb660c9652688f971535c1f92
Jay Shrauner [Thu, 16 Apr 2015 00:16:45 +0000 (00:16 +0000)]
Merge "Hide getUserSelectedOutgoingPhoneAccount"
Craig Mautner [Thu, 16 Apr 2015 00:15:35 +0000 (17:15 -0700)]
Fix build.
Change-Id: I46173df41fcfe44e44e030893bf60a8398c2c7f0
Wale Ogunwale [Thu, 16 Apr 2015 00:05:58 +0000 (17:05 -0700)]
Updated javadoc for persistRootOnly attribute.
To include information about task relinquishing identity.
Bug:
17618255
Change-Id: I94965fc213769b21ad70a22f3d3b603084054357
Zheng Fu [Wed, 15 Apr 2015 23:57:53 +0000 (16:57 -0700)]
Add setting flag to enable contact metadata syncing in CP2
Bug:
20269816
Change-Id: Ie0906c03d888f57bb0a09a2bebd7b161c797792e
Chris Watkins [Fri, 20 Mar 2015 17:31:42 +0000 (10:31 -0700)]
Unhide the android.media.[Media]DataSource interface.
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.
MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)
Only NuPlayer supports this new data source.
The change introduces:
* IDataSource: The binder interface for DataSource.
* JMediaDataSource: The native counterpart to the java interface. It
implements IDataSource.
* CallbackDataSource: A stagefright DataSource that wraps an IDataSource.
Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
Tim Murray [Wed, 15 Apr 2015 23:15:13 +0000 (23:15 +0000)]
am
3d9c9093: am
91d2f27b: am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
3d9c9093d1d76d4aeb5f99b1746b65788c72736e':
Add BNNM intrinsic.
Jorim Jaggi [Wed, 15 Apr 2015 23:09:20 +0000 (23:09 +0000)]
Merge "Fix VoiceInteraction permission issues"
Tim Murray [Wed, 15 Apr 2015 23:04:41 +0000 (23:04 +0000)]
am
91d2f27b: am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
91d2f27bc7dad2232d3f59c71f1402b86cb9f514':
Add BNNM intrinsic.
John Reck [Wed, 15 Apr 2015 22:52:10 +0000 (15:52 -0700)]
Remove Bitmap#getSkBitmap
Change-Id: Ifb9047b426122d3e5a445eb7a0eb3fce38dedf27
Jorim Jaggi [Wed, 15 Apr 2015 22:56:05 +0000 (22:56 +0000)]
Merge "More fingerprint API's for 3rd party apps"
Jay Shrauner [Wed, 15 Apr 2015 22:51:15 +0000 (15:51 -0700)]
Hide getUserSelectedOutgoingPhoneAccount
Bug:
20224972
Change-Id: I21528788e38817f77fc68b56e26a33ac726d39e2
Tim Murray [Wed, 15 Apr 2015 22:50:11 +0000 (22:50 +0000)]
am
7f72f747: Merge "Add BNNM intrinsic."
* commit '
7f72f74766fed73ae9816fec6031a199f70d1428':
Add BNNM intrinsic.
Craig Mautner [Wed, 15 Apr 2015 22:46:35 +0000 (22:46 +0000)]
Merge "Add tests for android:lockTaskMode."
Craig Mautner [Wed, 15 Apr 2015 22:45:36 +0000 (22:45 +0000)]
Merge "Introduce android:lockTaskMode"
Jorim Jaggi [Wed, 15 Apr 2015 22:11:48 +0000 (15:11 -0700)]
Fix VoiceInteraction permission issues
Change-Id: Id3796066353a6d7799ae983d18e6adc38c8cef52
Tim Murray [Wed, 15 Apr 2015 22:30:12 +0000 (22:30 +0000)]
Merge "Add BNNM intrinsic."