OSDN Git Service
Roozbeh Pournader [Fri, 1 May 2015 16:50:51 +0000 (16:50 +0000)]
Merge "Rename Noto Han fonts to their latest names." into mnc-dev
Amit Mahajan [Thu, 26 Feb 2015 18:46:17 +0000 (10:46 -0800)]
Support for bearer_bitmask.
Change-Id: I7cae3d229445607c66b6472124264588f7571097
Jeff Sharkey [Fri, 1 May 2015 16:22:40 +0000 (16:22 +0000)]
Merge "Move both app code and data together." into mnc-dev
John Reck [Fri, 1 May 2015 14:42:49 +0000 (14:42 +0000)]
Merge "A bunch more cleanups" into mnc-dev
Robin Lee [Fri, 1 May 2015 12:57:35 +0000 (12:57 +0000)]
Merge "Device policy: use owner label instead of name" into mnc-dev
Narayan Kamath [Fri, 24 Apr 2015 12:22:03 +0000 (13:22 +0100)]
AlarmManager: Reject non-olson timezones for targetSdk >= M
This has caused a lot of grief, confusion and outright broken
behaviour due to the fact that the Posix spec and the Java spec
define conflicting interpretations of "custom" timezones like
GMT+5:30 (eastern hemisphere for java, western for posix).
bug:
19987403
bug:
19106773
Change-Id: Ia9b007067bb175b0805d4262f17390a0bd98d927
Wei Wang [Fri, 1 May 2015 07:51:39 +0000 (07:51 +0000)]
Merge "Fix a bug in ScanSettings constructor." into mnc-dev
Wei Wang [Fri, 1 May 2015 07:50:32 +0000 (00:50 -0700)]
Fix a bug in ScanSettings constructor.
Change-Id: I36e6effe8063bacddd61fe2c47c0360d7ffaee71
Gus Prevas [Fri, 1 May 2015 07:36:43 +0000 (07:36 +0000)]
am
12b1b8ed: am
026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '
12b1b8ed3b5bfe623cd69d3cdafd8b6b5dfe68d8':
Fixes velocity tracking bug in SwipeDismissLayout.
Wei Wang [Fri, 1 May 2015 05:10:17 +0000 (05:10 +0000)]
Merge "Honor Ble scanning settings from Settings UI." into mnc-dev
Lorenzo Colitti [Fri, 1 May 2015 03:45:12 +0000 (03:45 +0000)]
Merge changes Icf7d67e2,Ia914ec88,I2490ad75,Ie79f2d28 into mnc-dev
* changes:
Add a hidden method to clear NetworkCapabilities.
Fix javadoc error for requestNetwork.
Simplify network callback handling code.
Document and unhide CALLBACK_PRECHECK.
Lorenzo Colitti [Mon, 27 Apr 2015 02:31:55 +0000 (11:31 +0900)]
Add a hidden method to clear NetworkCapabilities.
Change-Id: Icf7d67e24a09113340e9bff2c72526760914ef48
Lorenzo Colitti [Fri, 24 Apr 2015 08:03:31 +0000 (17:03 +0900)]
Fix javadoc error for requestNetwork.
The ConnectivityManager documentation uses {@link requestNetwork}
without specifying which version of that method it refers to.
This results in javadoc incorrectly linking to the version of the
method that takes a PendingIntent instead of the version that
takes a callback.
Change-Id: Ia914ec88005a6401b6391c5b4fc92f988baa3922
Lorenzo Colitti [Fri, 24 Apr 2015 06:21:21 +0000 (15:21 +0900)]
Simplify network callback handling code.
Change-Id: I2490ad754bf2a1282f27302c8556fb19983cc6b1
Lorenzo Colitti [Fri, 24 Apr 2015 03:23:24 +0000 (12:23 +0900)]
Document and unhide CALLBACK_PRECHECK.
Bug:
20038463
Change-Id: Ie79f2d28c06cf611289504e49c471b55ffb9890f
Robert Shih [Fri, 1 May 2015 00:31:22 +0000 (00:31 +0000)]
Merge "MediaPlayer: provide mime type for all track types" into mnc-dev
Miao Wang [Fri, 1 May 2015 00:26:31 +0000 (00:26 +0000)]
Merge "[RenderScript] typo fix in BLAS, TRMM & TSMM" into mnc-dev
tturney [Fri, 1 May 2015 00:17:40 +0000 (00:17 +0000)]
Merge "Fix typo. bug: b/
20610710" into mnc-dev
Miao Wang [Fri, 1 May 2015 00:14:28 +0000 (17:14 -0700)]
[RenderScript] typo fix in BLAS, TRMM & TSMM
Change-Id: I78f014a864700369c7ccdfb46a257851a45abd7c
Lajos Molnar [Thu, 30 Apr 2015 03:41:19 +0000 (20:41 -0700)]
media: Hook up MediaPlayer and MediaSync to new settings
Bug:
19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
Robert Shih [Thu, 30 Apr 2015 21:36:48 +0000 (14:36 -0700)]
MediaPlayer: provide mime type for all track types
Bug:
20729923
Change-Id: Id05ca0616a72f66abe6a541417baef491c49a417
Jeff Sharkey [Thu, 30 Apr 2015 23:04:50 +0000 (16:04 -0700)]
Move both app code and data together.
Refactor app movement code into the normal install flow as a new
flavor of InstallArgs. It copies both app code and data during the
copy step, and just updates paths during the rename step.
Measure free space before kicking off a move. Spawn a thread to
derive a hacky progress estimate based on free disk space counting
down.
Remove checkFreeStorage() and getLegacyNativeLibraryPath() which
nobody was calling. Fix deadlocks around package broadcasts, and fix
wrong lock ordering when loading packages.
Bug:
19993667,
20275578,
20370140
Change-Id: I7bbf14c924a724d6ebb8a41a02434750fa3302bc
Alan Viverette [Thu, 30 Apr 2015 23:00:28 +0000 (23:00 +0000)]
Merge "Fix layoutlib build breakage" into mnc-dev
Alan Viverette [Thu, 30 Apr 2015 22:57:42 +0000 (15:57 -0700)]
Fix layoutlib build breakage
Change-Id: Id3a9b79ac47ef27b04a96ff3ee50688bbb58f9c0
Andrew Lee [Thu, 30 Apr 2015 22:27:21 +0000 (22:27 +0000)]
Merge "Add handler parameter for callbacks." into mnc-dev
Andrew Lee [Thu, 23 Apr 2015 22:47:06 +0000 (15:47 -0700)]
Add handler parameter for callbacks.
Bug:
20160491
Change-Id: I94639b06b8c97b6585e169d667a67ce328e716af
Wei Wang [Mon, 27 Apr 2015 00:04:29 +0000 (17:04 -0700)]
Honor Ble scanning settings from Settings UI.
Bug:
20643039
Change-Id: Ib1465108e26b8537c9da1bfbb31a99d2e33da910
Rich Slogar [Thu, 30 Apr 2015 21:37:11 +0000 (21:37 +0000)]
Rich Slogar [Thu, 30 Apr 2015 21:37:07 +0000 (21:37 +0000)]
am
7fbde8f5: am
408aeb05: am
b6ad1ce8: am
541dda1c: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
7fbde8f508cf5148f395280753c99b63cc525e45':
Rich Slogar [Thu, 30 Apr 2015 21:37:02 +0000 (21:37 +0000)]
am
ac9c751d: am
62cfe97d: am
2653774a: am
b874dc04: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
ac9c751d74135994ddaa9ccc14e87809efc08693':
Rich Slogar [Thu, 30 Apr 2015 21:36:58 +0000 (21:36 +0000)]
am
994d6ffe: am
7a258afa: am
af73c6e7: am
ff24e8e1: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
994d6ffec75b50ff199760f4c3cf464b2d0f0e83':
John Reck [Mon, 13 Apr 2015 22:20:29 +0000 (15:20 -0700)]
A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI
Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
Rich Slogar [Thu, 30 Apr 2015 21:27:44 +0000 (21:27 +0000)]
Merge "resolved conflicts for merge of
edf44562 to mnc-dev" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:18 +0000 (21:25 +0000)]
Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
Miao Wang [Thu, 30 Apr 2015 21:25:01 +0000 (21:25 +0000)]
Merge "[RenderScript] fix edges cases about Transpose for SYMM & SYR2K" into mnc-dev
Rich Slogar [Thu, 30 Apr 2015 21:20:12 +0000 (14:20 -0700)]
resolved conflicts for merge of
edf44562 to mnc-dev
Change-Id: I2df8255d12feed8c17b9c9f009453701cd412676
Alan Viverette [Thu, 30 Apr 2015 21:03:22 +0000 (21:03 +0000)]
Merge "LayoutInflater should always try to generate LayoutParams for include" into mnc-dev
Alex Klyubin [Thu, 30 Apr 2015 21:00:59 +0000 (21:00 +0000)]
Merge "Handle KM_ERROR_CALLER_NONCE_PROHIBITED." into mnc-dev
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:57:44 +0000 (13:57 -0700)]
Handle KM_ERROR_CALLER_NONCE_PROHIBITED.
This converts KM_ERROR_CALLER_NONCE_PROHIBITED into
InvalidAlgorithmParameterSpec, as expected by the contract of JCA
Cipher.
Bug:
18088752
Change-Id: I6a01e2d7118c478b27a0d7a5a14a127de8913755
Alex Klyubin [Thu, 30 Apr 2015 20:56:17 +0000 (20:56 +0000)]
Merge "Fix thread affinity of FingerprintManager." into mnc-dev
Miao Wang [Thu, 30 Apr 2015 20:44:49 +0000 (13:44 -0700)]
[RenderScript] typo fix in rs BLAS jni, to correctly handle complex
params.
Change-Id: Ie44f430dc7ed4155f40aa9f9c2864fb0429c97fe
Todd Kennedy [Thu, 30 Apr 2015 20:38:48 +0000 (20:38 +0000)]
Merge "Remove dependency upon FragmentActivity" into mnc-dev
Miao Wang [Thu, 30 Apr 2015 17:47:42 +0000 (10:47 -0700)]
[RenderScript] fix edges cases about Transpose for SYMM & SYR2K
Change-Id: Id86d5fe8475060a22f49b06b6e1f8f3eae7c7e9f
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
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
Alan Viverette [Thu, 30 Apr 2015 19:33:54 +0000 (12:33 -0700)]
LayoutInflater should always try to generate LayoutParams for include
A recent optimization assumed that layout_width and layout_height always
had to be defined to successfully generate layout params, but this is not
guaranteed to be true for custom ViewGroups.
Bug:
20267738
Change-Id: If09d346f30c0848b984b9137088f8f3b7617cd08
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:49:57 +0000 (18:49 +0000)]
Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev
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: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: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
Robin Lee [Thu, 30 Apr 2015 13:18:22 +0000 (14:18 +0100)]
Device policy: use owner label instead of name
Managed provisioning does not currently set a meaningful profile owner
name. This changes to use the application label as returned by
PackageManager.getApplicationLabel which should be more descriptive.
Bug:
20679292
Change-Id: I5a0e87ef05b62879a73814e6d338e8b984b81c94
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 [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: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: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 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: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
Gus Prevas [Thu, 30 Apr 2015 15:42:03 +0000 (15:42 +0000)]
am
026e204e: Fixes velocity tracking bug in SwipeDismissLayout.
* commit '
026e204ee461e101fe251742f6ffb09b1747c804':
Fixes velocity tracking bug in SwipeDismissLayout.
Ronghua Wu [Thu, 30 Apr 2015 15:40:35 +0000 (15:40 +0000)]
Merge "media: set codec exception reason." into mnc-dev
Gus Prevas [Thu, 30 Apr 2015 15:14:14 +0000 (11:14 -0400)]
Fixes velocity tracking bug in SwipeDismissLayout.
This is the framework version of ag/682710.
Original change description:
This change adds a missing call to offsetLocation() when tracking
swipe velocities on a SwipeDismissLayout. This bug was causing
incorrect velocities to be measured which often resulted in an
incorrectly interpreted leftward swipe cancelling the dismiss
gesture.
Bug:
20350515
Change-Id: I4f3e3668a1f9aab963fdfa9095a43f4c5344703f
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: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:48:34 +0000 (09:48 +0000)]
Merge "Fix potential NPE on devices without DPMS" into mnc-dev
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: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: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:55:54 +0000 (03:55 +0000)]
Rich Slogar [Thu, 30 Apr 2015 03:55:50 +0000 (03:55 +0000)]
am
408aeb05: am
b6ad1ce8: am
541dda1c: am
999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs
* commit '
408aeb05e4edb75801f63d22771d6726a4d46ed4':
Rich Slogar [Thu, 30 Apr 2015 03:55:43 +0000 (03:55 +0000)]
am
62cfe97d: am
2653774a: am
b874dc04: am
07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs
* commit '
62cfe97d38a94bc32af9773c7f880723a7bf2f08':
Rich Slogar [Thu, 30 Apr 2015 03:55:38 +0000 (03:55 +0000)]
am
7a258afa: am
af73c6e7: am
ff24e8e1: am
5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs
* commit '
7a258afa65a8b9174b9080dc931add9a27c62256':
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
Rich Slogar [Thu, 30 Apr 2015 03:32:18 +0000 (03:32 +0000)]
am
7c267f66: am
f4b1df34: am
2a3aa2d3: docs: studio 1.2 updates
* commit '
7c267f663a39c314bd4ca5d831cc5cbac0d37260':
docs: studio 1.2 updates