git.osdn.net Git - android-x86/frameworks-base.git/log

Yorke Lee [Thu, 30 Apr 2015 19:13:00 +0000 (19:13 +0000)]

am e6a8bf80: am 08b51bfe: Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev

* commit 'e6a8bf80089ddea5cca01389df7fd827c5db7af2':
Add default dialer checks to Telecom/Telephony

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Thu, 30 Apr 2015 18:58:37 +0000 (18:58 +0000)]

am e08e3940: am 24ea865f: Merge "Volume l10n: Increase charlimits on zen submode strings." into mnc-dev

* commit 'e08e39402c6d896dffeb48ddb3ac8254addc8384':
Volume l10n: Increase charlimits on zen submode strings.

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:58:31 +0000 (18:58 +0000)]

am f44f6b0d: am e4762675: Merge "Fix the build" into mnc-dev

* commit 'f44f6b0d6d49b4ddde0d5b9152e7c1b9ba626b54':
Fix the build

commit | commitdiff | tree

Yorke Lee [Thu, 30 Apr 2015 18:49:57 +0000 (18:49 +0000)]

Merge "Add default dialer checks to Telecom/Telephony" into mnc-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Klyubin [Thu, 30 Apr 2015 18:39:44 +0000 (18:39 +0000)]

am f22b6732: am 4223ce7d: Merge "Track Keymaster changes." into mnc-dev

* commit 'f22b67323724fc5cd96f549817547b2936dfc7d6':
Track Keymaster changes.

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 30 Apr 2015 18:39:38 +0000 (18:39 +0000)]

am 6dee203a: am 6faa3aca: Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev

* commit '6dee203aee673eea91633d8557a4aa1ff21296cb':
Camera2: LEGACY: Support prepare(), sort of.

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:39:32 +0000 (18:39 +0000)]

am 0165cf4d: am 3327f3d6: Merge "Add use fingerprint app op - framework" into mnc-dev

* commit '0165cf4d719ab6560507a18ffd7375b0ad850622':
Add use fingerprint app op - framework

commit | commitdiff | tree

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

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:31:35 +0000 (18:31 +0000)]

Merge "Fix the build" into mnc-dev

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:30:33 +0000 (11:30 -0700)]

Fix the build

Change-Id: I24e697e989b5f88c3f5e61343fbff60a09aa4c12

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:29:58 +0000 (18:29 +0000)]

am 9e4003cd: am 729d0a06: Merge "Add process outgoing calls app op - framework" into mnc-dev

* commit '9e4003cde7dc33342042328923999ec545a8bfbf':
Add process outgoing calls app op - framework

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:29:49 +0000 (18:29 +0000)]

am 71264fb2: am c27b3fca: Merge "Add SIP app op - framework." into mnc-dev

* commit '71264fb236b50de815a328d9ecab29535d1ecb17':
Add SIP app op - framework.

commit | commitdiff | tree

Andreas Gampe [Thu, 30 Apr 2015 18:29:35 +0000 (18:29 +0000)]

am 5eedef96: am fcda22b1: Merge "am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp" into mnc-dev

* commit '5eedef96d9408cdb78b5a28878bf1013cc11f8d3':
am b6d14a00: resolved conflicts for merge of c29791d5 to mnc-dev-plus-aosp

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Alex Klyubin [Thu, 30 Apr 2015 18:15:23 +0000 (18:15 +0000)]

Merge "Track Keymaster changes." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 30 Apr 2015 18:10:29 +0000 (18:10 +0000)]

Merge "Camera2: LEGACY: Support prepare(), sort of." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:05:17 +0000 (18:05 +0000)]

Merge "Add use fingerprint app op - framework" into mnc-dev

commit | commitdiff | tree

Robin Lee [Thu, 30 Apr 2015 18:05:13 +0000 (18:05 +0000)]

am 644ff2f9: am ef25597a: SystemUI strings: prospective VPN strings for apps

* commit '644ff2f9d0dac0c34786578c0d0b79729a5c2664':
SystemUI strings: prospective VPN strings for apps

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:02:54 +0000 (18:02 +0000)]

Merge "Add process outgoing calls app op - framework" into mnc-dev

commit | commitdiff | tree

Svetoslav [Thu, 30 Apr 2015 18:01:50 +0000 (18:01 +0000)]

Merge "Add SIP app op - framework." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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)

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 30 Apr 2015 17:14:30 +0000 (17:14 +0000)]

am 3d42d238: am f764d219: Merge "AudioService receives callback for dynamic policy mix state changes" into mnc-dev

* commit '3d42d2380f5af53ce299610e27f40a8d88930c89':
AudioService receives callback for dynamic policy mix state changes

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Chris Craik [Thu, 30 Apr 2015 16:39:15 +0000 (16:39 +0000)]

am 75c4e3e4: am ed375f26: Merge "Fix rendernode flag logging" into mnc-dev

* commit '75c4e3e4d58f310174bbc24e6b2fb058773f8f31':
Fix rendernode flag logging

commit | commitdiff | tree

Alex Klyubin [Thu, 30 Apr 2015 16:39:11 +0000 (16:39 +0000)]

am 84c64efe: am 403ac2d6: Merge "AndroidKeyStore keys should not be handled by Bouncy Castle." into mnc-dev

* commit '84c64efef90818888dca12f7650a632b70438a8f':
AndroidKeyStore keys should not be handled by Bouncy Castle.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Alan Viverette [Thu, 30 Apr 2015 16:21:57 +0000 (16:21 +0000)]

am 19b9f8ef: am 8310f87d: Merge "ActionBar SearchView\'s default hint shouldn\'t override SearchableInfo" into mnc-dev

* commit '19b9f8ef3eaf392db0a993ae0d5a7a84e9d6c60f':
ActionBar SearchView's default hint shouldn't override SearchableInfo

commit | commitdiff | tree

Chris Craik [Thu, 30 Apr 2015 16:19:32 +0000 (16:19 +0000)]

Merge "Fix rendernode flag logging" into mnc-dev

commit | commitdiff | tree

John Spurlock [Thu, 30 Apr 2015 16:16:13 +0000 (16:16 +0000)]

am 1642e354: am 8f72b403: Merge "Zen: New event condition data model." into mnc-dev

* commit '1642e354ed10bc606f403ac6f529392f3f25dd2d':
Zen: New event condition data model.

commit | commitdiff | tree

Ronghua Wu [Thu, 30 Apr 2015 16:16:08 +0000 (16:16 +0000)]

am c98070a4: am 1b12db9e: Merge "media: set codec exception reason." into mnc-dev

* commit 'c98070a46168c14e54899bfca69889154e3a565d':
media: set codec exception reason.

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 30 Apr 2015 16:15:45 +0000 (16:15 +0000)]

am d0363bc3: am 5793f22e: Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev

* commit 'd0363bc3948894cc79f32719e04d66496572fe31':
Use theme attributes for FloatingToolbar colors.

commit | commitdiff | tree

Narayan Kamath [Thu, 30 Apr 2015 16:15:38 +0000 (16:15 +0000)]

am cf9f16d2: am 144b0bb6: Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev

* commit 'cf9f16d2b0900fdf9125f12f9c6c086123e7657d':
Fix incorrect javadoc for Uri.getQueryParameter.

commit | commitdiff | tree

Chris Craik [Thu, 30 Apr 2015 16:12:39 +0000 (09:12 -0700)]

Fix rendernode flag logging

Change-Id: I978c54ab26ef6dc3f6caef8604ac77a883b8e913

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

John Spurlock [Thu, 30 Apr 2015 15:45:53 +0000 (15:45 +0000)]

Merge "Zen: New event condition data model." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Ronghua Wu [Thu, 30 Apr 2015 15:40:35 +0000 (15:40 +0000)]

Merge "media: set codec exception reason." into mnc-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 30 Apr 2015 15:20:27 +0000 (15:20 +0000)]

am 795ec677: am 780a9b9e: Merge "Fix potential NPE on devices without DPMS" into mnc-dev

* commit '795ec67721c565ffa15a4c283428227c954e7a5f':
Fix potential NPE on devices without DPMS

commit | commitdiff | tree

Benjamin Franz [Thu, 30 Apr 2015 15:20:19 +0000 (15:20 +0000)]

am 550ab61c: am dc4ad271: Merge "Add package name extra to PackageInstaller callback" into mnc-dev

* commit '550ab61ca54cc0366842263563f8061d56931fcd':
Add package name extra to PackageInstaller callback

am 46fa9a96: am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev

* commit '46fa9a964f5897d8f125f5ad2e25080043810233':
Temp workaround to track max beacons.

commit | commitdiff | tree

Shawn Willden [Thu, 30 Apr 2015 15:19:50 +0000 (15:19 +0000)]

am 2ac378b3: am 7230bdf2: Merge "Add missing error codes from keymaster_defs.h." into mnc-dev

* commit '2ac378b3bb0d81e418239ef170bb9cb6159ddcae':
Add missing error codes from keymaster_defs.h.

commit | commitdiff | tree

Jeff Sharkey [Thu, 30 Apr 2015 15:19:41 +0000 (15:19 +0000)]

am 508c9fec: am 21df222f: Merge "New "frozen" state during app move/upgrade." into mnc-dev

* commit '508c9fecb6644a533ae63ff52596f484b1fe2806':
New "frozen" state during app move/upgrade.

commit | commitdiff | tree

John Spurlock [Thu, 30 Apr 2015 12:47:20 +0000 (12:47 +0000)]

am ad61b833: Merge "Fix no vibration during shutdown."

* commit 'ad61b8336aa9627a6ae19580bbdc370dc8bd6810':
Fix no vibration during shutdown.

commit | commitdiff | tree

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.

commit | commitdiff | tree

John Spurlock [Thu, 30 Apr 2015 12:22:38 +0000 (12:22 +0000)]

Merge "Fix no vibration during shutdown."

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 30 Apr 2015 12:18:48 +0000 (12:18 +0000)]

Merge "Use theme attributes for FloatingToolbar colors." into mnc-dev

commit | commitdiff | tree

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.

commit | commitdiff | tree

Narayan Kamath [Thu, 30 Apr 2015 11:25:35 +0000 (11:25 +0000)]

Merge "Fix incorrect javadoc for Uri.getQueryParameter." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Benjamin Franz [Thu, 30 Apr 2015 08:33:45 +0000 (08:33 +0000)]

Merge "Add package name extra to PackageInstaller callback" into mnc-dev

am 05a419ae: Merge "Temp workaround to track max beacons." into mnc-dev

* commit '05a419aed54da30999a3831d8da6e2e72f85bd40':
Temp workaround to track max beacons.

Merge "Temp workaround to track max beacons." into mnc-dev

Temp workaround to track max beacons.

Change-Id: Ia65a7a0ec98d0181cf62db343e00c4a0b01c32d8

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Sharkey [Thu, 30 Apr 2015 05:09:01 +0000 (05:09 +0000)]

Merge "New "frozen" state during app move/upgrade." into mnc-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Rich Slogar [Thu, 30 Apr 2015 03:59:51 +0000 (03:59 +0000)]

am f3770b4b: am c3563bf7: am 6891f035: am 572ecb6e: am 999b08b7: Merge "docs: studio 1.2 downloads" into lmp-docs

* commit 'f3770b4b6460eb8f0a36d6427aff0fa1e4ac8400':
docs: studio 1.2 downloads

commit | commitdiff | tree

Rich Slogar [Thu, 30 Apr 2015 03:59:44 +0000 (03:59 +0000)]

am 58129c17: am 88410eeb: am cd63231f: am 47bd51e6: am 07aca646: Merge "docs: plugin 1.2.0 revision updates" into lmp-docs

* commit '58129c176624acefd65f0182dfece8af50553734':
docs: plugin 1.2.0 revision updates

commit | commitdiff | tree

Rich Slogar [Thu, 30 Apr 2015 03:59:40 +0000 (03:59 +0000)]

am 1f6c1f37: am 2894c5d4: am 58b0fc56: am d8293d83: am 5b7546a6: Merge "docs: studio 1.2 revision updates" into lmp-docs

* commit '1f6c1f37142efd143577175b06cf991d31b040d5':
docs: studio 1.2 revision updates

commit | commitdiff | tree

Alex Klyubin [Thu, 30 Apr 2015 03:59:34 +0000 (03:59 +0000)]

am c27b11f4: am 459ef1e7: Surface KeyPermanentlyInvalidatedException for per-op auth keys.

* commit 'c27b11f43678ee2e8b0a481975abb5e218e2a3cc':
Surface KeyPermanentlyInvalidatedException for per-op auth keys.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andrew Solovay [Thu, 30 Apr 2015 03:44:10 +0000 (03:44 +0000)]

am 3500ad4c: am 4fbdbbe8: am c15736b9: am c2e2c7d5: Merge "docs: Minor formatting cleanup." into lmp-mr1-ub-docs

* commit '3500ad4c51a1ff2afc5d1d2369fbadebae6e81c7':
docs: Minor formatting cleanup.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Alex Klyubin [Thu, 30 Apr 2015 03:10:59 +0000 (03:10 +0000)]

am e0c70dc4: am f0abe000: Merge "Enable per-use user authenticated keys to be used." into mnc-dev

* commit 'e0c70dc4b39319d981745cdc6610175a361ad456':
Enable per-use user authenticated keys to be used.