OSDN Git Service
John Reck [Thu, 30 Apr 2015 21:09:41 +0000 (21:09 +0000)]
am
db672b03: Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
* commit '
db672b03a2de26127b40dbe50c794b5697b01c37':
Change how Java Bitmaps are accessed in a few places
Alex Klyubin [Thu, 30 Apr 2015 21:09:36 +0000 (21:09 +0000)]
am
0069301d: Merge "Fix thread affinity of FingerprintManager." into mnc-dev
* commit '
0069301d364a219bbd4b166ba6f4d9be854d556f':
Fix thread affinity of FingerprintManager.
John Reck [Thu, 30 Apr 2015 21:00:07 +0000 (21:00 +0000)]
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 20:56:17 +0000 (20:56 +0000)]
Merge "Fix thread affinity of FingerprintManager." into mnc-dev
Todd Kennedy [Thu, 30 Apr 2015 20:51:21 +0000 (20:51 +0000)]
am
10a54a79: Merge "Remove dependency upon FragmentActivity" into mnc-dev
* commit '
10a54a7989a03eb0fdee7641c5795ac85b57e0dc':
Remove dependency upon FragmentActivity
Glenn Kasten [Thu, 30 Apr 2015 20:39:21 +0000 (20:39 +0000)]
am
2757fed2: Merge "Clarifying which receiver method to call." into mnc-dev
* commit '
2757fed2d612b7d7331e8ad9067df24b154ff8d7':
Clarifying which receiver method to call.
Todd Kennedy [Thu, 30 Apr 2015 20:38:48 +0000 (20:38 +0000)]
Merge "Remove dependency upon FragmentActivity" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 20:30:48 +0000 (13:30 -0700)]
Fix thread affinity of FingerprintManager.
FingerprintManager internally creates a Handler which needs to be
bound to a Looper thread. Prior to this CL the Handler was bound to
the Looper of the current thread. This caused issues:
* Different instances of FingerprintManager could be bound to
different Looper threads.
* Callbacks from FingerprintManager were invoked on arbitrary
threads (or not at all if the Looper was there but wasn't running).
* FingerprintManager couldn't be obtained by apps on most non-main
threads leading to java.lang.RuntimeException: Can't create handler
inside thread that has not called Looper.prepare().
This CL fixes the issue by binding the FingerprintManager's Handler to
the Looper running on the main thread.
Bug:
20725228
Change-Id: I4a0382d6e11df9f23b8db9f0deec77369af31b5e
Glenn Kasten [Thu, 30 Apr 2015 20:27:59 +0000 (20:27 +0000)]
Merge "Clarifying which receiver method to call." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:59:17 +0000 (19:59 +0000)]
am
033dc46b: Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
* commit '
033dc46bb949a9a5e42ed51bbff1e055a7c58ca2':
Switch from FingerprintService to FingerprintManager.
Alex Klyubin [Thu, 30 Apr 2015 19:59:13 +0000 (19:59 +0000)]
am
3cd8ec3c: Merge "Cleanup logic for per-op auth keys." into mnc-dev
* commit '
3cd8ec3c6832ee142e217e2653cce58de3f1dba1':
Cleanup logic for per-op auth keys.
Todd Kennedy [Wed, 15 Apr 2015 01:22:54 +0000 (18:22 -0700)]
Remove dependency upon FragmentActivity
The FragmentManagerImpl is intimately tied with a FragmentActivity. In
many cases, we want to be able to create / manage Fragments outside of
a FragmentManager. This defines a FragmentController interface that can
be used by any class to host Fragments.
Bug:
19569654
Change-Id: I6816a5c1815122d206062b9f4584ad460b3d41dd
John Reck [Fri, 10 Apr 2015 20:52:57 +0000 (13:52 -0700)]
Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead
Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed
Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
Alex Klyubin [Thu, 30 Apr 2015 19:45:54 +0000 (19:45 +0000)]
Merge "Switch from FingerprintService to FingerprintManager." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 19:44:13 +0000 (19:44 +0000)]
Merge "Cleanup logic for per-op auth keys." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 18:43:53 +0000 (11:43 -0700)]
Switch from FingerprintService to FingerprintManager.
FingerprintService is a lower layer of abstraction which should
ideally be accessed only via FingerprintManager from
AndroidKeyStore.
The main issue with the switch is that it requires a reference to a
Context. This is now obtained using ActivityThread's hidden API.
Change-Id: If921e169838ee2cc5c7690b8c8d8ea95c33248aa
Peter Brinkmann [Thu, 30 Apr 2015 18:46:07 +0000 (14:46 -0400)]
Clarifying which receiver method to call.
Change-Id: Iaf89e1ff27e257fd25c54e189e8fcd1b10e8edfc
Mady Mellor [Thu, 30 Apr 2015 19:23:12 +0000 (19:23 +0000)]
am
2619ef39: Merge "Add onStylusButtonPress listener to View" into mnc-dev
* commit '
2619ef3918e15bf415fb038e942cfbd98bff4c6a':
Add onStylusButtonPress listener to View
Mady Mellor [Thu, 30 Apr 2015 19:06:44 +0000 (19:06 +0000)]
Merge "Add onStylusButtonPress listener to View" into mnc-dev
Yorke Lee [Thu, 30 Apr 2015 18:58:54 +0000 (18:58 +0000)]
am
08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
* commit '
08b51bfe8532ab7eff38ad69ad46c251be5c2792':
Add default dialer checks to Telecom/Telephony
Yorke Lee [Thu, 30 Apr 2015 18:49:57 +0000 (18:49 +0000)]
Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 18:40:20 +0000 (18:40 +0000)]
am
24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
* commit '
24ea865f0fd3b1ceafb3786bbed20ea345bc5cc0':
Volume l10n: Increase charlimits on zen submode strings.
Svetoslav [Thu, 30 Apr 2015 18:40:16 +0000 (18:40 +0000)]
am
e4762675: Merge "Fix the build" into mnc-dev
* commit '
e4762675023bd2be20992c7bccce7e555a249e93':
Fix the build
John Spurlock [Thu, 30 Apr 2015 18:31:58 +0000 (18:31 +0000)]
Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:31:35 +0000 (18:31 +0000)]
Merge "Fix the build" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:30:33 +0000 (11:30 -0700)]
Fix the build
Change-Id: I24e697e989b5f88c3f5e61343fbff60a09aa4c12
John Spurlock [Thu, 30 Apr 2015 18:29:33 +0000 (14:29 -0400)]
Volume l10n: Increase charlimits on zen submode strings.
Bug:
20713756
Change-Id: Ib8f65997bfbd2c5a042bc02ff13ef9d5c8f90ecb
Alex Klyubin [Thu, 30 Apr 2015 18:24:31 +0000 (18:24 +0000)]
am
4223ce7d: Merge "Track Keymaster changes." into mnc-dev
* commit '
4223ce7dc8b1f0544a7d273831b674b6be1e5c4f':
Track Keymaster changes.
Eino-Ville Talvala [Thu, 30 Apr 2015 18:24:25 +0000 (18:24 +0000)]
am
6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
* commit '
6faa3acaad130533a4d597938fc15b04988a02b2':
Camera2: LEGACY: Support prepare(), sort of.
Svetoslav [Thu, 30 Apr 2015 18:24:20 +0000 (18:24 +0000)]
am
3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev
* commit '
3327f3d6886a96ad70f4e96e4b7c26b9555429b6':
Add use fingerprint app op - framework
Alex Klyubin [Thu, 30 Apr 2015 18:15:23 +0000 (18:15 +0000)]
Merge "Track Keymaster changes." into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 17:50:45 +0000 (10:50 -0700)]
Track Keymaster changes.
* MAC length is now specified as a parameters to the begin operation
instead of as a parameter at key generation/import time.
* KM_TAG_MAC_LENGTH is now in bits instead of in bytes.
Change-Id: I752fe232d11d3ac39a575a48948215d84ded8fb9
Eino-Ville Talvala [Thu, 30 Apr 2015 18:10:29 +0000 (18:10 +0000)]
Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:06:01 +0000 (18:06 +0000)]
am
729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev
* commit '
729d0a06eaaa40f5be4d9dc5bd580f525ba8360e':
Add process outgoing calls app op - framework
Svetoslav [Thu, 30 Apr 2015 18:05:57 +0000 (18:05 +0000)]
am
c27b3fca: Merge "Add SIP app op - framework." into mnc-dev
* commit '
c27b3fca8258c3d7c27b42b4f6978d91f09dcb52':
Add SIP app op - framework.
Andreas Gampe [Thu, 30 Apr 2015 18:05:53 +0000 (18:05 +0000)]
am
fcda22b1: Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
* commit '
fcda22b1fe33370922a53d6562aa15366818bd45':
am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp
Svetoslav [Thu, 30 Apr 2015 18:05:17 +0000 (18:05 +0000)]
Merge "Add use fingerprint app op - framework" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:02:54 +0000 (18:02 +0000)]
Merge "Add process outgoing calls app op - framework" into mnc-dev
Svetoslav [Thu, 30 Apr 2015 18:01:50 +0000 (18:01 +0000)]
Merge "Add SIP app op - framework." into mnc-dev
Andreas Gampe [Thu, 30 Apr 2015 17:53:48 +0000 (17:53 +0000)]
Merge "am
b6d14a00: resolved conflicts for merge of
c29791d5 to mnc-dev-plus-aosp" into mnc-dev
Robin Lee [Thu, 30 Apr 2015 17:51:12 +0000 (17:51 +0000)]
am
ef25597a: SystemUI strings: prospective VPN strings for apps
* commit '
ef25597acfb15b1f4f501fbdcbafd1b6fa8cc9c6':
SystemUI strings: prospective VPN strings for apps
Robin Lee [Wed, 29 Apr 2015 16:15:49 +0000 (17:15 +0100)]
SystemUI strings: prospective VPN strings for apps
Bug:
20516964
Change-Id: Ifaeb388896145fd71ff9aa9fab6e2b04af807631
(cherry picked from commit
63539bd5fac53d90adff35df340562a1926d610e)
Alex Klyubin [Thu, 30 Apr 2015 17:13:39 +0000 (10:13 -0700)]
Cleanup logic for per-op auth keys.
This streamlines the exception throwing logic for per-op auth keys of
AndroidKeyStore.
Change-Id: I7e27c17fd89d5a7f71f5d7578f584189c5236fb8
Mady Mellor [Thu, 30 Apr 2015 16:58:35 +0000 (09:58 -0700)]
Add onStylusButtonPress listener to View
The gesture is: stylus touching screen + button pressed, the event
is recognized when the button is pressed, not when it's released.
It can be pressed during DOWN or MOVE.
If the stylus touch + press button is occurring longpress cannot
occur and vice versa. Also adds the haptic feedback and accessibility
bits specific to the new gesture.
Bug:
19620479
Change-Id: Ibc4654978ef39e7b4251d17636453d90f3bf622d
Jean-Michel Trivi [Thu, 30 Apr 2015 16:57:03 +0000 (16:57 +0000)]
am
f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
* commit '
f764d219f0faf82219600761c8d0562623b8f054':
AudioService receives callback for dynamic policy mix state changes
Jean-Michel Trivi [Thu, 30 Apr 2015 16:43:17 +0000 (16:43 +0000)]
Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 16:25:39 +0000 (16:25 +0000)]
am
ed375f26: Merge "Fix rendernode flag logging" into mnc-dev
* commit '
ed375f269bab6fb9f0dc224defae8099b2b1a7f7':
Fix rendernode flag logging
Alex Klyubin [Thu, 30 Apr 2015 16:25:33 +0000 (16:25 +0000)]
am
403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
* commit '
403ac2d64f7ad53ecf9ccd713951cf151ea2f2bc':
AndroidKeyStore keys should not be handled by Bouncy Castle.
Chris Craik [Thu, 30 Apr 2015 16:19:32 +0000 (16:19 +0000)]
Merge "Fix rendernode flag logging" into mnc-dev
Chris Craik [Thu, 30 Apr 2015 16:12:39 +0000 (09:12 -0700)]
Fix rendernode flag logging
Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913
Alex Klyubin [Thu, 30 Apr 2015 16:12:32 +0000 (16:12 +0000)]
Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 16:07:36 +0000 (16:07 +0000)]
am
8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev
* commit '
8310f87d96791e8b864df5e821fe65273c2dd874':
ActionBar SearchView's default hint shouldn't override SearchableInfo
Alan Viverette [Thu, 30 Apr 2015 15:59:20 +0000 (15:59 +0000)]
Merge "ActionBar SearchView's default hint shouldn't override SearchableInfo" into mnc-dev
John Spurlock [Thu, 30 Apr 2015 15:58:27 +0000 (15:58 +0000)]
am
8f72b403: Merge "Zen: New event condition data model." into mnc-dev
* commit '
8f72b4037022c4f860caafa296e2ac309bde177f':
Zen: New event condition data model.
Ronghua Wu [Thu, 30 Apr 2015 15:58:22 +0000 (15:58 +0000)]
am
1b12db9e: Merge "media: set codec exception reason." into mnc-dev
* commit '
1b12db9e6225171da87ed9586daeabf76b53c05a':
media: set codec exception reason.
John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]
Merge "Zen: New event condition data model." into mnc-dev
John Spurlock [Thu, 30 Apr 2015 13:30:52 +0000 (09:30 -0400)]
Zen: New event condition data model.
- Add system condition provider for calendar event-based rules.
- Add stub condition provider for handling event conditions.
- Add various shared items to support new settings subpage.
Bug:
20064962
Change-Id: I6f5afe0f1444976f0dc6807048e0580e8a28070e
Ronghua Wu [Thu, 30 Apr 2015 15:40:35 +0000 (15:40 +0000)]
Merge "media: set codec exception reason." into mnc-dev
Abodunrinwa Toki [Thu, 30 Apr 2015 12:33:04 +0000 (12:33 +0000)]
am
5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
* commit '
5793f22e68f74522dfe5780b96b22d18617467be':
Use theme attributes for FloatingToolbar colors.
Abodunrinwa Toki [Thu, 30 Apr 2015 12:18:48 +0000 (12:18 +0000)]
Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev
Narayan Kamath [Thu, 30 Apr 2015 11:35:58 +0000 (11:35 +0000)]
am
144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
* commit '
144b0bb6053010f0e0da65cee89401b87633bbff':
Fix incorrect javadoc for Uri.getQueryParameter.
Narayan Kamath [Thu, 30 Apr 2015 11:25:35 +0000 (11:25 +0000)]
Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev
Narayan Kamath [Mon, 27 Apr 2015 10:00:54 +0000 (11:00 +0100)]
Fix incorrect javadoc for Uri.getQueryParameter.
This first went out with Jelly Bean and not ICS.
bug: https://code.google.com/p/android/issues/detail?id=61651
(cherry picked from commit
4356c95354d28b8ceb1b04e97c53c2ba3b3faa93)
Change-Id: I5b96bcb20aa3a1d227dd5b00926af077276fc666
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 09:59:18 +0000 (09:59 +0000)]
am
780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev
* commit '
780a9b9e12228402144f5c88917875c9da226cbf':
Fix potential NPE on devices without DPMS
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 09:48:34 +0000 (09:48 +0000)]
Merge "Fix potential NPE on devices without DPMS" into mnc-dev
Benjamin Franz [Thu, 30 Apr 2015 09:40:39 +0000 (09:40 +0000)]
am
dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev
* commit '
dc4ad271f931eca48ab8ef22ef76db740d179d99':
Add package name extra to PackageInstaller callback
Zoltan Szatmary-Ban [Thu, 30 Apr 2015 09:38:24 +0000 (10:38 +0100)]
Fix potential NPE on devices without DPMS
Bug:
20563108
Change-Id: Ie2bda65c834ddad9db8753f7616c2754072551cd
Benjamin Franz [Thu, 30 Apr 2015 08:33:45 +0000 (08:33 +0000)]
Merge "Add package name extra to PackageInstaller callback" into mnc-dev
Wei Wang [Thu, 30 Apr 2015 07:13:18 +0000 (07:13 +0000)]
am
05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev
* commit '
05a419aed54da30999a3831d8da6e2e72f85bd40':
Temp workaround to track max beacons.
Wei Wang [Thu, 30 Apr 2015 07:08:42 +0000 (07:08 +0000)]
Merge "Temp workaround to track max beacons." into mnc-dev
Wei Wang [Wed, 29 Apr 2015 18:14:18 +0000 (11:14 -0700)]
Temp workaround to track max beacons.
Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8
Shawn Willden [Thu, 30 Apr 2015 05:18:27 +0000 (05:18 +0000)]
am
7230bdf2: Merge "Add missing error codes from keymaster_defs.h." into mnc-dev
* commit '
7230bdf23bf905a60ac2c209f04fcf83264fec56':
Add missing error codes from keymaster_defs.h.
Jeff Sharkey [Thu, 30 Apr 2015 05:18:23 +0000 (05:18 +0000)]
am
21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev
* commit '
21df222fa8f3fdeb38dc7d59b6bcba15971d340b':
New "frozen" state during app move/upgrade.
Shawn Willden [Thu, 30 Apr 2015 05:14:50 +0000 (05:14 +0000)]
Merge "Add missing error codes from keymaster_defs.h." into mnc-dev
Shawn Willden [Tue, 28 Apr 2015 06:05:03 +0000 (00:05 -0600)]
Add missing error codes from keymaster_defs.h.
Bug:
20127433
Change-Id: I32eab62459003c526d3cf9ef108be7b2fd709960
Jeff Sharkey [Thu, 30 Apr 2015 05:09:01 +0000 (05:09 +0000)]
Merge "New "frozen" state during app move/upgrade." into mnc-dev
Jeff Sharkey [Thu, 30 Apr 2015 04:44:57 +0000 (21:44 -0700)]
New "frozen" state during app move/upgrade.
This replaces mOperationPending, which was in an odd place. It adds
a new PackageSetting.frozen flag that is a last-ditch effort to
prevent ActivityManager from starting an app while it's being moved
or upgraded.
Also provides clearer guarding around all upgrades by freezing,
killing, upgrading, then unfreezing.
Bug:
20275579
Change-Id: I28bb0359a6f4e05080fb336b18dd2a249509d989
Rich Slogar [Thu, 30 Apr 2015 03:53:19 +0000 (03:53 +0000)]
am
c3563bf7: am
6891f035: am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
c3563bf7e07ba7f307d681aefacf2850f9e6d557':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:53:15 +0000 (03:53 +0000)]
am
88410eeb: am
cd63231f: am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
88410eeb68fd280197fbef18fe31419a4848b9dd':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:53:10 +0000 (03:53 +0000)]
am
2894c5d4: am
58b0fc56: am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
2894c5d4de3886a48ff87c799148e72f287639e9':
docs: studio 1.2 revision updates
Alex Klyubin [Thu, 30 Apr 2015 03:53:06 +0000 (03:53 +0000)]
am
459ef1e7: Surface KeyPermanentlyInvalidatedException for per-op auth keys.
* commit '
459ef1e7ce2a128f194087f9689df830b7870884':
Surface KeyPermanentlyInvalidatedException for per-op auth keys.
Rich Slogar [Thu, 30 Apr 2015 03:48:38 +0000 (03:48 +0000)]
am
6891f035: am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
6891f0359ba56c8132bb0b69595e40d7eab46a14':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:48:31 +0000 (03:48 +0000)]
am
cd63231f: am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
cd63231f9015c8da0e1f57809f171e25d7cdd75a':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:48:26 +0000 (03:48 +0000)]
am
58b0fc56: am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
58b0fc56ef447cb78665e9324245a0af08977b14':
docs: studio 1.2 revision updates
Andrew Solovay [Thu, 30 Apr 2015 03:30:51 +0000 (03:30 +0000)]
am
4fbdbbe8: am
c15736b9: am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
4fbdbbe8f1bbf743ea730774173667835749787e':
docs: Minor formatting cleanup.
Alex Klyubin [Thu, 30 Apr 2015 03:28:41 +0000 (20:28 -0700)]
Surface KeyPermanentlyInvalidatedException for per-op auth keys.
Bug:
20642549
Change-Id: Ibda270921f13a1fd695264583b0e4bd255f63aed
Rich Slogar [Thu, 30 Apr 2015 03:28:39 +0000 (03:28 +0000)]
am
572ecb6e: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
572ecb6e5e5a5ffbf2e10ef4702e9d75f097c5fe':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 03:28:30 +0000 (03:28 +0000)]
am
47bd51e6: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
47bd51e63c3b3c59c354af86f400fd00a4afecae':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 03:28:26 +0000 (03:28 +0000)]
am
d8293d83: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
d8293d837e50a8aaf8b365ee08f96e9d5ce26625':
docs: studio 1.2 revision updates
Andrew Solovay [Thu, 30 Apr 2015 03:14:13 +0000 (03:14 +0000)]
am
c15736b9: am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
c15736b95d61033f03b1446371315bfa46252aaf':
docs: Minor formatting cleanup.
Andrew Solovay [Thu, 30 Apr 2015 02:58:08 +0000 (02:58 +0000)]
am
c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs
* commit '
c2e2c7d5f5b8bf699d7177a4dc7694719323fd87':
docs: Minor formatting cleanup.
Rich Slogar [Thu, 30 Apr 2015 02:57:52 +0000 (02:57 +0000)]
am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
999b08b74c29937b49c4106a784117eed6168045':
docs: studio 1.2 downloads
Rich Slogar [Thu, 30 Apr 2015 02:57:45 +0000 (02:57 +0000)]
am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
07aca646e43ea27329c079d8ff6549127e4fcc25':
docs: plugin 1.2.0 revision updates
Rich Slogar [Thu, 30 Apr 2015 02:57:38 +0000 (02:57 +0000)]
am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
5b7546a67b5fef2adab70d95da4879381b9b0e92':
docs: studio 1.2 revision updates
Alex Klyubin [Thu, 30 Apr 2015 02:57:00 +0000 (02:57 +0000)]
am
f0abe000: Merge "Enable per-use user authenticated keys to be used." into mnc-dev
* commit '
f0abe000eb491f8b990d99d3159dc949f3c8e0e3':
Enable per-use user authenticated keys to be used.
Alex Klyubin [Thu, 30 Apr 2015 02:46:29 +0000 (02:46 +0000)]
Merge "Enable per-use user authenticated keys to be used." into mnc-dev
Rich Slogar [Thu, 30 Apr 2015 02:40:25 +0000 (02:40 +0000)]
Merge "docs: studio 1.2 downloads" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:57 +0000 (02:39 +0000)]
Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
Rich Slogar [Thu, 30 Apr 2015 02:39:25 +0000 (02:39 +0000)]
Merge "docs: studio 1.2 revision updates" into lmp-docs
Miao Wang [Thu, 30 Apr 2015 02:35:47 +0000 (02:35 +0000)]
am
9e4dbf05: Merge changes I99f9f9ff,I559b5c56 into mnc-dev
* commit '
9e4dbf05573dc81b3138ac455cfdfa07f63a9d08':
[RenderScript] L2 BLAS, fix element type in ZHER
[RenderScript] fixes for L3 BLAS APIs