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

Clara Bayarri [Thu, 14 May 2015 15:15:28 +0000 (15:15 +0000)]

am bff329b8: Merge "Tests for ActionBarContainer\'s startActionModeForChild" into mnc-dev

* commit 'bff329b851a4806672842dc3e4608cee18ae9a1e':
Tests for ActionBarContainer's startActionModeForChild

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:15:23 +0000 (15:15 +0000)]

am e9db8f8f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'e9db8f8fe7b036fcdb015a960f5d28f37243ada7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:15:18 +0000 (15:15 +0000)]

am b065a136: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'b065a1365a0cf0f9a7484af05333907a04481c60':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:15:13 +0000 (15:15 +0000)]

am 027d5126: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '027d5126f22919d8b2ab3f6331113aaa67511d02':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:15:03 +0000 (15:15 +0000)]

am 69ea07be: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '69ea07be05e062c360d103009b0ae000b520532b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Robin Lee [Thu, 14 May 2015 15:14:53 +0000 (15:14 +0000)]

am 39087b1c: Replace String host:port/url args with Uri arg

* commit '39087b1cec6a54e96ab9eafe8317952720790533':
Replace String host:port/url args with Uri arg

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:14:39 +0000 (15:14 +0000)]

am a47fb5ad: Merge "Fix build." into mnc-dev

* commit 'a47fb5ad5d3863bc6de418c7269d2463f39f432b':
Fix build.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:14:29 +0000 (15:14 +0000)]

am 228837b1: Merge "Update rendering fidelity tag to use constant." into mnc-dev

* commit '228837b180de980abf68309d3547b3181441467d':
Update rendering fidelity tag to use constant.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:14:23 +0000 (15:14 +0000)]

am e6460224: Merge "Revert "Call dispatchFinishTemporaryDetach before returning a transient view"" into mnc-dev

* commit 'e646022429aa6e2150fff883d509be3f739205f4':
Revert "Call dispatchFinishTemporaryDetach before returning a transient view"

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:14:03 +0000 (15:14 +0000)]

am 3a76780c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '3a76780cf9bbb22a6d6f144c86910f026d32a4a8':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:55 +0000 (15:13 +0000)]

am 11a3f9aa: Merge "Use Balanced line breaker instead of HighQuality." into mnc-dev

* commit '11a3f9aa6736f2ef698b413c63682492faefbcdc':
Use Balanced line breaker instead of HighQuality.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:49 +0000 (15:13 +0000)]

am 63b3332f: Merge "Update nav bar icons." into mnc-dev

* commit '63b3332fad70e814e9fc0aa85d00f8d6d82b3059':
Update nav bar icons.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:44 +0000 (15:13 +0000)]

am addf6266: Merge "Load ICU data in LayoutLib" into mnc-dev

* commit 'addf6266288ee7e00ee3d223865a68a49f62e4bf':
Load ICU data in LayoutLib

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:38 +0000 (15:13 +0000)]

am 4728cd17: Merge "Add missing delegates for M preview." into mnc-dev

* commit '4728cd1706073a699b39f27e12719989526b4dfe':
Add missing delegates for M preview.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:32 +0000 (15:13 +0000)]

am a2366b0c: Merge "Run setup for full tests only once." into mnc-dev

* commit 'a2366b0c2eb4a7607ad5654fd635431c4f410366':
Run setup for full tests only once.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 14 May 2015 15:13:24 +0000 (15:13 +0000)]

am db42c336: Merge "Remove kxml dependency." into mnc-dev

* commit 'db42c336caaef3e9dce6fdc04d78040e91c55a8b':
Remove kxml dependency.

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:13:19 +0000 (15:13 +0000)]

am 2817f7fe: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2817f7feb0ddb135e5af3e639b0f470bbf14b9ca':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Keisuke Kuroyanagi [Thu, 14 May 2015 15:13:10 +0000 (15:13 +0000)]

am 0433488d: Merge "Track difference between touch and word in x coordinate." into mnc-dev

* commit '0433488daaf3347d0e6f0e18a42606df805f347d':
Track difference between touch and word in x coordinate.

commit | commitdiff | tree

Dan Sandler [Thu, 14 May 2015 15:13:03 +0000 (15:13 +0000)]

am 08a04c15: Icon support comes to Notification.

* commit '08a04c15245c970856022d0779aa27d4d63cdee3':
Icon support comes to Notification.

commit | commitdiff | tree

Dan Sandler [Thu, 14 May 2015 15:12:57 +0000 (15:12 +0000)]

am a22a380f: Add Icon support to ImageView.

* commit 'a22a380fbbe224783d8b82440ca8692b0ff5b0a2':
Add Icon support to ImageView.

commit | commitdiff | tree

Geoff Mendal [Thu, 14 May 2015 15:12:36 +0000 (15:12 +0000)]

am ae597c33: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ae597c33dc3697cf5c314d88cb597cb41c362eb3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Vinit Deshpande [Thu, 14 May 2015 15:12:00 +0000 (15:12 +0000)]

am a3b9a224: Merge "fix null pointer crash" into mnc-dev

* commit 'a3b9a2240ef25ae7c7fae557be150f43fdd5f675':
fix null pointer crash

commit | commitdiff | tree

Lorenzo Colitti [Thu, 14 May 2015 15:11:32 +0000 (15:11 +0000)]

am c9be9f4d: Merge "Only activate the wifi alternate reality hack for KK and lower" into mnc-dev

* commit 'c9be9f4d5bcf513654dbca24e648312d61e04bfc':
Only activate the wifi alternate reality hack for KK and lower

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 14 May 2015 15:11:26 +0000 (15:11 +0000)]

am f578953e: Merge "AudioTrack in SoundPool uses audio_attributes_t parameter" into mnc-dev

* commit 'f578953eadb194833e18a52737691d3540b8b7fa':
AudioTrack in SoundPool uses audio_attributes_t parameter

commit | commitdiff | tree

Jeff Brown [Thu, 14 May 2015 15:11:20 +0000 (15:11 +0000)]

am 0d3b6dbc: Merge "DO NOT MERGE - Overlay display now support multiple modes." into mnc-dev

* commit '0d3b6dbc4c37c300bc5880f2deb328aa8108c9ba':
DO NOT MERGE - Overlay display now support multiple modes.

commit | commitdiff | tree

Sanket Padawe [Thu, 14 May 2015 15:11:10 +0000 (15:11 +0000)]

am 402be062: Merge "Hotspot 2.0 UI." into mnc-dev

* commit '402be0628c3c27273e826344ec7b12d53f861152':
Hotspot 2.0 UI.

commit | commitdiff | tree

Andy Hung [Thu, 14 May 2015 15:10:59 +0000 (15:10 +0000)]

am 2bdd69c4: Merge "Add getChannelIndexMasks API to AudioDeviceInfo" into mnc-dev

* commit '2bdd69c4a2d9a8a5e94770a710123fb1958cf25b':
Add getChannelIndexMasks API to AudioDeviceInfo

commit | commitdiff | tree

Jaesung Chung [Thu, 14 May 2015 15:10:54 +0000 (15:10 +0000)]

am f5edb20a: Merge "TIF: Add DVB device handling to TvInputManagerService" into mnc-dev

* commit 'f5edb20ae90ab9a817c8cf23b5a0d21fe8c80e2a':
TIF: Add DVB device handling to TvInputManagerService

commit | commitdiff | tree

Santos Cordon [Thu, 14 May 2015 15:10:42 +0000 (15:10 +0000)]

am e9ea718f: Merge "Improve javadoc for PRESENTATION_ constants." into mnc-dev

* commit 'e9ea718f30915a5fdb37030bc4073038a95491ae':
Improve javadoc for PRESENTATION_ constants.

commit | commitdiff | tree

Santos Cordon [Thu, 14 May 2015 15:10:31 +0000 (15:10 +0000)]

am d9e1fe3c: Merge "[1/4] Use new Icon class in PhoneAccount." into mnc-dev

* commit 'd9e1fe3cd443e02e64f6006be4bc5d5622082675':
[1/4] Use new Icon class in PhoneAccount.

commit | commitdiff | tree

Yorke Lee [Thu, 14 May 2015 15:10:26 +0000 (15:10 +0000)]

am ad0bfe3a: Merge "Add BIND_TELECOM_CONNECTION_SERVICE permission" into mnc-dev

* commit 'ad0bfe3ae2f056a568c6256614079e6f31f5d542':
Add BIND_TELECOM_CONNECTION_SERVICE permission

commit | commitdiff | tree

Svetoslav [Thu, 14 May 2015 15:10:10 +0000 (15:10 +0000)]

am 857c3019: Merge "Do not allow opting out from the new permission model." into mnc-dev

* commit '857c3019bac34bbabaa8d5ebb4ab0047ca07cfc5':
Do not allow opting out from the new permission model.

commit | commitdiff | tree

Wale Ogunwale [Thu, 14 May 2015 15:09:58 +0000 (15:09 +0000)]

am 8a2978c9: Merge "Don\'t stop animation when starting windows app token changes" into mnc-dev

* commit '8a2978c9ab5edd97e1de97fdc2ac6c6e2f7bb02b':
Don't stop animation when starting windows app token changes

commit | commitdiff | tree

Mikhail Naganov [Thu, 14 May 2015 15:09:51 +0000 (15:09 +0000)]

am 822f1aaf: Merge "Update the new error reporting API in android.webkit" into mnc-dev

* commit '822f1aaf2b35f8a89efcdace187a73f1232b1961':
Update the new error reporting API in android.webkit

commit | commitdiff | tree

Amith Yamasani [Thu, 14 May 2015 15:09:34 +0000 (15:09 +0000)]

am 3d32a1c0: Merge "Allow settings to change app inactive state" into mnc-dev

* commit '3d32a1c04d1a67465bd6462140231cdd3d5effb2':
Allow settings to change app inactive state

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 14 May 2015 15:09:29 +0000 (15:09 +0000)]

am aef477a6: Merge "Add IntentFilter auto verification - part 11" into mnc-dev

* commit 'aef477a65e9baaf1feb2c60350f1faf0132d8e92':
Add IntentFilter auto verification - part 11

commit | commitdiff | tree

Yorke Lee [Thu, 14 May 2015 15:09:23 +0000 (15:09 +0000)]

am e01f9355: Merge "Rename AudioState to CallAudioState" into mnc-dev

* commit 'e01f93557d85a4e1d8da249117c0822463535cb1':
Rename AudioState to CallAudioState

commit | commitdiff | tree

Jason Monk [Thu, 14 May 2015 15:09:14 +0000 (15:09 +0000)]

am 7853e137: Merge "Add QS Tuner" into mnc-dev

* commit '7853e137eda0866c732a301e6b3ffb19408634b4':
Add QS Tuner

commit | commitdiff | tree

Dianne Hackborn [Thu, 14 May 2015 15:09:08 +0000 (15:09 +0000)]

am c352722e: Ignore small time changes in alarm manager.

* commit 'c352722e8af0a5510144b5f32ea87561db553f42':
Ignore small time changes in alarm manager.

commit | commitdiff | tree

John Reck [Thu, 14 May 2015 15:08:52 +0000 (15:08 +0000)]

am e3a6a69a: am 7238435e: (-s ours) resolved conflicts for merge of e869835d to lmp-mr1-ub-dev

* commit 'e3a6a69acb910890371ce741940e1d3e5293389f':
DO NOT MERGE Backport of limited jank-tracking metrics

commit | commitdiff | tree

Dianne Hackborn [Thu, 14 May 2015 15:08:47 +0000 (15:08 +0000)]

am 6495ef97: Merge "Fix build." into mnc-dev

* commit '6495ef975f330d07370da46f69a7e808b3177467':
Fix build.

commit | commitdiff | tree

Jorim Jaggi [Thu, 14 May 2015 15:08:41 +0000 (15:08 +0000)]

am 6a587acd: Merge "Fix fingerprint for multiuser" into mnc-dev

* commit '6a587acd1dcaa0b0d58ff9ac58e8a2ebff0aa3be':
Fix fingerprint for multiuser

commit | commitdiff | tree

Andy Hung [Thu, 14 May 2015 15:08:36 +0000 (15:08 +0000)]

am 1864460b: Merge "Allow partial playback parameter settings in AudioTrack" into mnc-dev

* commit '1864460bf3c495e7821326f9753324247d4c778b':
Allow partial playback parameter settings in AudioTrack

commit | commitdiff | tree

Robert Greenwalt [Thu, 14 May 2015 15:08:19 +0000 (15:08 +0000)]

am 5703ef5b: Merge "Add support for static RadioCapabilities." into mnc-dev

* commit '5703ef5bf85f4810b1c0958bd1c45603af055db7':
Add support for static RadioCapabilities.

commit | commitdiff | tree

David Friedman [Thu, 14 May 2015 15:08:02 +0000 (15:08 +0000)]

am 3ac45742: am 3ccf0caf: am 7fc3b6c0: am abd8d422: am f5d6156c: Merge "Docs: NDK r10e changes to publish to DAC." into lmp-docs

* commit '3ac457420a2833e8a86f8a8aa372e81e0843c887':
Docs: NDK r10e changes to publish to DAC.

commit | commitdiff | tree

Chris Craik [Thu, 14 May 2015 15:07:47 +0000 (15:07 +0000)]

am 6b4ace29: Merge "Add back alpha atrace log" into mnc-dev

* commit '6b4ace298e3c30ed11fbcb168229f492323e19ba':
Add back alpha atrace log

commit | commitdiff | tree

Svet Ganov [Thu, 14 May 2015 15:07:41 +0000 (15:07 +0000)]

am 67b7ec28: Merge "Access mock location is no longer a runtime permission - framework" into mnc-dev

* commit '67b7ec28872dcb0ba09ef01bb87f7d558cbd19fc':
Access mock location is no longer a runtime permission - framework

commit | commitdiff | tree

Robert Shih [Thu, 14 May 2015 15:07:17 +0000 (15:07 +0000)]

am 55e6ad78: Merge "MediaPlayer/TimedMetaData: API updates related to timed metadata" into mnc-dev

* commit '55e6ad78a0a30f917b6f0c135fdf328ebafc68fb':
MediaPlayer/TimedMetaData: API updates related to timed metadata

commit | commitdiff | tree

Alan Viverette [Thu, 14 May 2015 15:07:06 +0000 (15:07 +0000)]

am bf6d50f9: Merge "Call dispatchFinishTemporaryDetach before returning a transient view" into mnc-dev

* commit 'bf6d50f906b33a7ace8a04f6b87826a8dca05db9':
Call dispatchFinishTemporaryDetach before returning a transient view

commit | commitdiff | tree

Dianne Hackborn [Thu, 14 May 2015 15:06:10 +0000 (15:06 +0000)]

am 4f5e0248: Merge "Hide getPackageProcessState(), it is not ready yet." into mnc-dev

* commit '4f5e024875a60d210ba3bb0322148db630adb53c':
Hide getPackageProcessState(), it is not ready yet.

commit | commitdiff | tree

Ihab Awad [Thu, 14 May 2015 15:05:59 +0000 (15:05 +0000)]

am 24145d45: Merge "Refactor StatusHints (1/3)" into mnc-dev

* commit '24145d451b823920022a643a73dafa8675e5a8a8':
Refactor StatusHints (1/3)

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 14 May 2015 15:05:53 +0000 (15:05 +0000)]

am fe112e7b: Merge "Add IntentFilter auto verification - part 10" into mnc-dev

* commit 'fe112e7b388fe582a4e57c26fdf651511b0bbb5a':
Add IntentFilter auto verification - part 10

commit | commitdiff | tree

Lajos Molnar [Thu, 14 May 2015 15:05:32 +0000 (15:05 +0000)]

am 907d8afd: Merge "media: rename MediaCodec.setSurface to setOutputSurface" into mnc-dev

* commit '907d8afd6bb99b8dfe1ace6a60cdbc708493f0c2':
media: rename MediaCodec.setSurface to setOutputSurface

commit | commitdiff | tree

Selim Gurun [Thu, 14 May 2015 15:05:23 +0000 (15:05 +0000)]

am af9d60af: Merge "Address API feedback for PostMessage" into mnc-dev

* commit 'af9d60af0df4d1972a91bfbafd7d3a36424c4817':
Address API feedback for PostMessage

commit | commitdiff | tree

Jorim Jaggi [Thu, 14 May 2015 15:05:12 +0000 (15:05 +0000)]

am 11274bb3: Merge "Fix build" into mnc-dev

* commit '11274bb3e44c714dc3c1d214251eea288b756606':
Fix build

commit | commitdiff | tree

Nick Kralevich [Thu, 14 May 2015 15:05:06 +0000 (15:05 +0000)]

am 9831fad6: Merge "Modify how USB connections are handled." into mnc-dev

* commit '9831fad6768135dbd982d6dca78d7f6de81bb320':
Modify how USB connections are handled.

commit | commitdiff | tree

Jorim Jaggi [Thu, 14 May 2015 15:04:47 +0000 (15:04 +0000)]

am 645edef4: Merge "Make sure the app can draw a frame before unlocking" into mnc-dev

* commit '645edef4834c2911386b659cc775840fb7479e01':
Make sure the app can draw a frame before unlocking

commit | commitdiff | tree

Junda Liu [Thu, 14 May 2015 15:04:41 +0000 (15:04 +0000)]

am 4d0f2afd: Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

* commit '4d0f2afdc4332c28193d2d57a11f260150b0b4b3':
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

commit | commitdiff | tree

Yohei Yukawa [Thu, 14 May 2015 15:04:34 +0000 (15:04 +0000)]

am 5ad7fe49: Merge "Update IME focus when the active view is losing the focus." into mnc-dev

* commit '5ad7fe4930b5566836debffc8976802c186b6ee3':
Update IME focus when the active view is losing the focus.

commit | commitdiff | tree

Junda Liu [Thu, 14 May 2015 15:04:27 +0000 (15:04 +0000)]

am 07e02b6d: Merge "Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense." into mnc-dev

* commit '07e02b6d25f5a731a36ad49b482e35c14c97cbdc':
Rename BOOL_SHOW_CDMA to BOOL_SHOW_CDMA_CHOICES, so the name makes more sense.

commit | commitdiff | tree

Hui Shu [Thu, 14 May 2015 15:04:19 +0000 (15:04 +0000)]

am 7b1b3613: Merge "Address API council feedback for setOffscreenPreRaster." into mnc-dev

* commit '7b1b3613b9b927606254429acc811dd9bfeeebff':
Address API council feedback for setOffscreenPreRaster.

commit | commitdiff | tree

Jonathan Basseri [Thu, 14 May 2015 15:03:58 +0000 (15:03 +0000)]

am b731c3d9: Add null annotations for getting carrier config.

* commit 'b731c3d944ccf46b7d0115f63b63eee5ab8abf1a':
Add null annotations for getting carrier config.

commit | commitdiff | tree

Nancy Chen [Thu, 14 May 2015 15:03:48 +0000 (15:03 +0000)]

am 78250907: Merge "Add phone account field for voicemail to distinguish the source." into mnc-dev

* commit '782509076bf4ca155865c465985a458e83d9b577':
Add phone account field for voicemail to distinguish the source.

commit | commitdiff | tree

Jae Seo [Thu, 14 May 2015 15:03:31 +0000 (15:03 +0000)]

am ae649b1a: Merge "TIF: API Review: android.media.tv" into mnc-dev

* commit 'ae649b1af86f0464cea073125103e45d1bd40fc8':
TIF: API Review: android.media.tv

commit | commitdiff | tree

Alan Viverette [Thu, 14 May 2015 15:03:25 +0000 (15:03 +0000)]

am 4f4855bc: Merge "Use drawableStart in dialog list item so we can set padding" into mnc-dev

* commit '4f4855bca8597e79aad950de7974a8d552952571':
Use drawableStart in dialog list item so we can set padding

commit | commitdiff | tree

Adam Lesinski [Thu, 14 May 2015 15:03:19 +0000 (15:03 +0000)]

am 4ee67bc7: Merge "AAPT2: Fix issue where @null was wrongly encoded" into mnc-dev

* commit '4ee67bc7a7bb84da1c92dc08427f9737ff8252d6':
AAPT2: Fix issue where @null was wrongly encoded

commit | commitdiff | tree

Jorim Jaggi [Thu, 14 May 2015 15:03:10 +0000 (15:03 +0000)]

am ae8fcaf4: Merge "Use platform delay for assist long press gesture" into mnc-dev

* commit 'ae8fcaf4c320dbf68db7dc032269692806150d99':
Use platform delay for assist long press gesture

commit | commitdiff | tree

Adam Lesinski [Thu, 14 May 2015 15:03:04 +0000 (15:03 +0000)]

am 45fefaef: Merge "AAPT2: Debug: Dump only targetted style" into mnc-dev

* commit '45fefaef008c16af42256fb2d8eab183245d030d':
AAPT2: Debug: Dump only targetted style

commit | commitdiff | tree

Adam Lesinski [Thu, 14 May 2015 15:02:58 +0000 (15:02 +0000)]

am 68727a0b: Merge "AAPT2: inferred style parent processing" into mnc-dev

* commit '68727a0b2074d6a9c03cff967c28da069deedae3':
AAPT2: inferred style parent processing

commit | commitdiff | tree

Adam Lesinski [Thu, 14 May 2015 15:02:52 +0000 (15:02 +0000)]

am 79e04686: Merge "AAPT2: Support static lib referencing static lib" into mnc-dev

* commit '79e04686f6b57ce3a5adf415212c592ad4c6d605':
AAPT2: Support static lib referencing static lib

commit | commitdiff | tree

Alex Klyubin [Thu, 14 May 2015 15:02:46 +0000 (15:02 +0000)]

am 87cca291: Merge "New AndroidKeyStore API in android.security.keystore." into mnc-dev

* commit '87cca291bd70100522b62a28e7e6e433fcd49cc2':
New AndroidKeyStore API in android.security.keystore.

commit | commitdiff | tree

Kenny Guy [Thu, 14 May 2015 15:01:52 +0000 (15:01 +0000)]

am 467eb056: Merge "Allowing profile to set a subset of keyguard restrictions." into mnc-dev

* commit '467eb0566ff1df320c9a9be3da0f44ee3d6bc9fa':
Allowing profile to set a subset of keyguard restrictions.

commit | commitdiff | tree

Jason Monk [Thu, 14 May 2015 15:01:45 +0000 (15:01 +0000)]

am d7fd0450: Merge "Add default icon for permissions" into mnc-dev

* commit 'd7fd045014b746a9822a66390288f44b63e4dc2f':
Add default icon for permissions

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 May 2015 15:01:30 +0000 (15:01 +0000)]

am c968e219: Merge "Determine if we have adoptable disks." into mnc-dev

* commit 'c968e219372e140e2ae34f9b1e91597ccb719381':
Determine if we have adoptable disks.

commit | commitdiff | tree

Chris Craik [Thu, 14 May 2015 15:01:24 +0000 (15:01 +0000)]

am d6acd422: Merge "Revert "Anti-alias by default"" into mnc-dev

* commit 'd6acd422aff35bc7cb8ab46fa422a4be7fffd026':
Revert "Anti-alias by default"

commit | commitdiff | tree

Chris Craik [Thu, 14 May 2015 15:01:03 +0000 (15:01 +0000)]

am 74a727d0: Merge "Anti-Alias ColorDrawable" into mnc-dev

* commit '74a727d06100c7fb9bc3f4d0a1e1b29151172b58':
Anti-Alias ColorDrawable

commit | commitdiff | tree

John Spurlock [Thu, 14 May 2015 15:00:58 +0000 (15:00 +0000)]

am bc2c21e2: Merge "Volume: Update divider color to match qs tile divider color." into mnc-dev

* commit 'bc2c21e2922e6b3441bb4f80caed4328af5993af':
Volume: Update divider color to match qs tile divider color.

commit | commitdiff | tree

John Spurlock [Thu, 14 May 2015 15:00:54 +0000 (15:00 +0000)]

am 765e1592: Merge "Volume: Use inactive slider tints when disabled." into mnc-dev

* commit '765e1592b15025d86b050e35519f975862582b8f':
Volume: Use inactive slider tints when disabled.

commit | commitdiff | tree

Jorim Jaggi [Thu, 14 May 2015 15:00:47 +0000 (15:00 +0000)]

am 131a19ee: Merge "Persist fingerprint names" into mnc-dev

* commit '131a19ee6f55d95d747d3d1ed62537b1db5a2e69':
Persist fingerprint names

commit | commitdiff | tree

Todd Kennedy [Thu, 14 May 2015 15:00:42 +0000 (15:00 +0000)]

am d90bf462: Merge "Don\'t negate saving state" into mnc-dev

* commit 'd90bf46264615159e1e16ee69e78a8651e126d6e':
Don't negate saving state

commit | commitdiff | tree

Julia Reynolds [Thu, 14 May 2015 15:00:20 +0000 (15:00 +0000)]

am 396d9440: Merge "Remove initiator name param." into mnc-dev

* commit '396d944001f0b897b1689baa0bd7d3e04046b3ca':
Remove initiator name param.

commit | commitdiff | tree

Kenny Root [Thu, 14 May 2015 15:00:02 +0000 (15:00 +0000)]

am f5d758c0: Merge "Start handshake before calling hostname verifier, part 2" into mnc-dev

* commit 'f5d758c006c278d166f22587f3deb9a63bdf4e4b':
Start handshake before calling hostname verifier, part 2

commit | commitdiff | tree

John Spurlock [Thu, 14 May 2015 14:59:56 +0000 (14:59 +0000)]

am fb13d497: Merge "Zen: Use shorter version of countdown condition summary in footer." into mnc-dev

* commit 'fb13d497ae2a68444dad89a4c2e0a6fa19ad4bf2':
Zen: Use shorter version of countdown condition summary in footer.

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 May 2015 14:59:48 +0000 (14:59 +0000)]

am 2817f22d: Merge "Hide API not ready for prime time." into mnc-dev

* commit '2817f22d157fd02fe6df14b76b59bac1276b5b86':
Hide API not ready for prime time.

commit | commitdiff | tree

Chong Zhang [Thu, 14 May 2015 14:59:34 +0000 (14:59 +0000)]

am 80283cd7: Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev

* commit '80283cd747d247780a5336bad6b41811175fd282':
MediaCodec: rename usePersistentInputSurface to setInputSurface

commit | commitdiff | tree

Alex Klyubin [Thu, 14 May 2015 14:59:27 +0000 (14:59 +0000)]

am b3345551: Merge "Ensure key algorithm name of HMAC keys is preserved." into mnc-dev

* commit 'b33455511b7b704e848c79c9e76e28abe2509178':
Ensure key algorithm name of HMAC keys is preserved.

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 May 2015 14:59:15 +0000 (14:59 +0000)]

am 4af455be: Merge "Rewriting should fail when any paths are null." into mnc-dev

* commit '4af455beb79086a960f7205d7b730aa6da015993':
Rewriting should fail when any paths are null.

commit | commitdiff | tree

Jeff Sharkey [Thu, 14 May 2015 14:59:06 +0000 (14:59 +0000)]

am 4c27d917: Merge "Updated storage notification icons." into mnc-dev

* commit '4c27d9170842813d12fd30850d0b5b7e170aad4a':
Updated storage notification icons.

commit | commitdiff | tree

John Spurlock [Thu, 14 May 2015 14:59:00 +0000 (14:59 +0000)]

am 2047ce82: Merge "Zen: Serialize notify conditions calls, defer subscription." into mnc-dev

* commit '2047ce824030a2ea6227a7544789281530b7892d':
Zen: Serialize notify conditions calls, defer subscription.

commit | commitdiff | tree

Kenny Root [Thu, 14 May 2015 14:58:54 +0000 (14:58 +0000)]

am 84260768: Merge "Start handshake before calling hostname verifier" into mnc-dev

* commit '84260768c44860fbe11c014c47c8f7340a394512':
Start handshake before calling hostname verifier

commit | commitdiff | tree

Amith Yamasani [Thu, 14 May 2015 14:58:38 +0000 (14:58 +0000)]

am 59a5733a: Merge "Track app idle history and dump it" into mnc-dev

* commit '59a5733adfc8fc4d906407f7edee1b9c61e73437':
Track app idle history and dump it

commit | commitdiff | tree

Fred Chung [Thu, 14 May 2015 14:58:32 +0000 (14:58 +0000)]

am fc9b0604: am ba649917: am 09a8de75: Merge "docs: M Preview Program Overview page" into mnc-preview-docs

* commit 'fc9b0604fa862c1fc12a129892b629e0955e3721':
docs: M Preview Program Overview page

commit | commitdiff | tree

Jason Monk [Thu, 14 May 2015 14:57:57 +0000 (14:57 +0000)]

am 401c40a8: Merge "SettingsLib: Track permission\'s packageName" into mnc-dev

* commit '401c40a8228598e18f6891b34218e99cca79e760':
SettingsLib: Track permission's packageName

commit | commitdiff | tree

Hiroshi Yamauchi [Thu, 14 May 2015 14:57:50 +0000 (14:57 +0000)]

am c126b8e8: Merge "Replace JNI primitive array critical calls with non-critical ones." into mnc-dev

* commit 'c126b8e81f5055dadfa8805d530a262a2cf05ab3':
Replace JNI primitive array critical calls with non-critical ones.

commit | commitdiff | tree

Dirk Dougherty [Thu, 14 May 2015 14:57:41 +0000 (14:57 +0000)]

am 1b8b3a00: Merge "resolved conflicts for merge of 45fed517 to mnc-dev" into mnc-dev

* commit '1b8b3a0000812f9935f33667b055a546228ebfb6':
Doc change: add new engagement and other distribute files.

commit | commitdiff | tree

Chad Brubaker [Thu, 14 May 2015 14:57:15 +0000 (14:57 +0000)]

am 90c66e3d: Merge "Add keystore onUserAdded/Removed methods" into mnc-dev

* commit '90c66e3ded4a91613b0c1760ab2ef15e0d118a36':
Add keystore onUserAdded/Removed methods

commit | commitdiff | tree

Chris Wren [Thu, 14 May 2015 14:57:05 +0000 (14:57 +0000)]

am 5e4027fe: Merge "induct a bunch of new logging categories." into mnc-dev

* commit '5e4027fe258f92d2d8b1d181cd959086aa84ac15':
induct a bunch of new logging categories.

commit | commitdiff | tree

Alan Viverette [Thu, 14 May 2015 14:56:43 +0000 (14:56 +0000)]

am 876677ef: Merge "Strip PNG metadata" into mnc-dev

* commit '876677ef2d04545593fd4cd7bb8539fa15e3dc09':
Strip PNG metadata

commit | commitdiff | tree

Jonathan Basseri [Thu, 14 May 2015 14:56:32 +0000 (14:56 +0000)]

am c69cd0bf: Merge "Switching to PersistableBundle in carrier config API." into mnc-dev

* commit 'c69cd0bf7586c57f9662955d798a2ae0eef6ee76':
Switching to PersistableBundle in carrier config API.

commit | commitdiff | tree

Nicolas Prevot [Thu, 14 May 2015 14:56:24 +0000 (14:56 +0000)]

am 22fec220: Merge "Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED." into mnc-dev

* commit '22fec2201f01222d61c84f536289fd1e8bb5a03f':
Fix the doc for ACTION_MANAGED_PROFILE_PROVISIONED.