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

Michael Wright [Thu, 27 Aug 2015 10:08:44 +0000 (10:08 +0000)]

am 56700e24: (-s ours) am d7255cfb: Merge "DO NOT MERGE. Add new media navigation keys." into mnc-dev

* commit '56700e24b4ea68701589ff731a3397fa8ee47ca8':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:08:33 +0000 (10:08 +0000)]

am c9d50277: (-s ours) am 38d30dc5: Merge "Immediately kill a shared user process on a permission revocation." into mnc-dev

* commit 'c9d502779832242914d70c956306faca6d97d193':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 10:08:23 +0000 (10:08 +0000)]

am 0607e785: (-s ours) am 77566dd1: Merge "Use BluetoothController for status bar icon status" into mnc-dev

* commit '0607e7857c4f827a3588d621e2f8d99efced8e54':

commit | commitdiff | tree

Jeff Davidson [Thu, 27 Aug 2015 10:08:12 +0000 (10:08 +0000)]

am 393a27c8: (-s ours) am 1d7c3254: Merge "Correctly propagate permissions when uninstalling updates." into mnc-dev

* commit '393a27c89ccd0fb2d436eda5a918b5c83aff2c93':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 10:07:59 +0000 (10:07 +0000)]

am 6b415901: (-s ours) am a0ef49c4: Look for recent tasks in live stacks.

* commit '6b415901155084fd4aaa3eba0ad3b3aa52a6a63f':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 10:07:48 +0000 (10:07 +0000)]

am 5cb02008: (-s ours) am 8f26616d: Merge "LayoutLib: Switch SimpleDateFormat to icu." into mnc-dev

* commit '5cb02008f9187ebcca2f24ac6d17f7ac26d1ff3e':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 10:07:38 +0000 (10:07 +0000)]

am 1cf52f6b: (-s ours) am 385ce0a3: Merge "Replace Locale.getDefault with custom impl." into mnc-dev

* commit '1cf52f6be944037ecfd29fcd5be37806fdf317fb':

commit | commitdiff | tree

Andres Morales [Thu, 27 Aug 2015 10:07:28 +0000 (10:07 +0000)]

am 84fd6e97: (-s ours) am 85c73c40: Merge "[UserManager] expose method to retrieve credential owner" into mnc-dev

* commit '84fd6e9733d39d2e61a3bab8f5c1c17892acdca7':

commit | commitdiff | tree

Winson Chung [Thu, 27 Aug 2015 10:07:14 +0000 (10:07 +0000)]

am 342b2044: (-s ours) am bb55aa1a: Merge "Fixing issue with empty Recents screen." into mnc-dev

* commit '342b20447a2f024d7f79138c25e7b6638cb5e97a':

commit | commitdiff | tree

Wei Jia [Thu, 27 Aug 2015 10:06:59 +0000 (10:06 +0000)]

am 7e758862: (-s ours) am a89e9f6d: Merge "MediaSync: fix API comments." into mnc-dev

* commit '7e7588629910b50bab8dc20b3b439a7ee04a85e4':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 10:06:46 +0000 (10:06 +0000)]

am 3d4f4b33: (-s ours) am cb54ffb2: Merge "Protect runtime storage mount points." into mnc-dev

* commit '3d4f4b33fdb86ad457e8bde878787025597d222b':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 10:06:35 +0000 (10:06 +0000)]

am 816f07bc: (-s ours) am 93f3fc87: Merge "add metrics to assistant" into mnc-dev

* commit '816f07bce057fdbe9f50c4cb0a2b1cbf111fb660':

commit | commitdiff | tree

Benjamin Franz [Thu, 27 Aug 2015 10:06:22 +0000 (10:06 +0000)]

am dfa85910: (-s ours) am 339a9bbf: Merge "Use realActivity as indicator for task locking" into mnc-dev

* commit 'dfa8591068a7f7899298da229fb6dea6585a2737':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:06:09 +0000 (10:06 +0000)]

am 80dc28e7: (-s ours) am 38c0fbda: Merge "Pregrant unrevokable storage permission to the CertInstaller" into mnc-dev

* commit '80dc28e72fe6a8f11ae867496e93b6cb7103d83f':

commit | commitdiff | tree

Paul Mclean [Thu, 27 Aug 2015 10:05:59 +0000 (10:05 +0000)]

am 0c3c81ef: (-s ours) am af7748ef: Merge "Consider channel index masks when calculating channel counts." into mnc-dev

* commit '0c3c81ef037e89e67e7d0d7ccc176c12e6637184':

commit | commitdiff | tree

Paul Mclean [Thu, 27 Aug 2015 10:05:48 +0000 (10:05 +0000)]

am 9048088d: (-s ours) am c770b7a5: Merge "Add a (hidden) mapping for REMOTE_SUBMIX device types for CTS test." into mnc-dev

* commit '9048088de5d54e1560d7ca16034b3ca7ed72382c':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 10:05:38 +0000 (10:05 +0000)]

am ad853777: (-s ours) am c7f8133f: Merge "Update anchor background on the correct view in PopupWindow" into mnc-dev

* commit 'ad8537778f4fd3a4363b3ce2c8db744b5acdbb2c':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 10:05:27 +0000 (10:05 +0000)]

am aa8daf78: (-s ours) am 6b0f1e78: Merge "Fix issue #22843150: fragment transaction crash from onRequestPermisssionResult" into mnc-dev

* commit 'aa8daf7851044e6d5676bdb7578cca7e25b0484a':

commit | commitdiff | tree

Chet Haase [Thu, 27 Aug 2015 10:05:17 +0000 (10:05 +0000)]

am 26762506: (-s ours) am da493aa6: Merge "Avoid changing internal state of shared drawable" into mnc-dev

* commit '26762506bcf9f6d401050d0744ddf3639e1a05b5':

commit | commitdiff | tree

Alan Treadway [Thu, 27 Aug 2015 10:05:06 +0000 (10:05 +0000)]

am e4b8c760: (-s ours) am 190a88d2: Merge "Update documentation of DevicePolicyManager intents." into mnc-dev

* commit 'e4b8c760ba64e20b1a9b6e745502c91b98d27fb5':

commit | commitdiff | tree

Michael Wright [Thu, 27 Aug 2015 10:04:55 +0000 (10:04 +0000)]

am 46b7af57: (-s ours) am d5a6df6d: Merge "Make the NullVibrator really null." into mnc-dev

* commit '46b7af57d7fd4354139801785a3eeb0579f4b6f9':

commit | commitdiff | tree

Michael Wright [Thu, 27 Aug 2015 10:04:42 +0000 (10:04 +0000)]

am 7a125e45: (-s ours) am eb7e3d7e: Merge "Don\'t dispatch when non-interactive and the display is off." into mnc-dev

* commit '7a125e455d9b56d33d8dbc7c962260c2c4434a5a':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 10:04:25 +0000 (10:04 +0000)]

am 24d7c503: (-s ours) am a3b5a612: Merge "Store ringer mode on entering DND mode so it can be restored on exit." into mnc-dev

* commit '24d7c503a1a8c72e9541e33a7e6412d0591d546f':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 10:04:05 +0000 (10:04 +0000)]

am 307be111: (-s ours) am 375c792c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '307be111b06d11c376936329e5ef878a1388f2f5':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 10:03:47 +0000 (10:03 +0000)]

am 088c8de2: (-s ours) am d14c4844: Merge "Pass connection configuration when setting wifi info" into mnc-dev

* commit '088c8de233134294049129bc5a542d61a1740d5d':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 10:03:33 +0000 (10:03 +0000)]

am e15a5871: (-s ours) am 61234dea: am bd4c482b: Merge "Clean up AssetManager::scanAndMergeZipLocked"

* commit 'e15a5871bdba6aef1febbf14cdd58864a9e905f9':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 10:03:20 +0000 (10:03 +0000)]

am 96e2975c: (-s ours) am be948f5a: Merge "Removing tethering overlay for mcc202-mnc05 (VF Greece)." into mnc-dev

* commit '96e2975cbb22ecca4c00bf237ef4027f951a7e73':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 10:03:08 +0000 (10:03 +0000)]

am a950fe0a: (-s ours) am 120fc2c7: Merge "Disable fingerprint when remotely reset by DPM" into mnc-dev

* commit 'a950fe0ab39bcf64895605e27cc4c21f73258a15':

commit | commitdiff | tree

Yorke Lee [Thu, 27 Aug 2015 10:03:01 +0000 (10:03 +0000)]

am 3d98e175: (-s ours) am f0affc6d: Merge "Correctly hide setConnectionService" into mnc-dev

* commit '3d98e175b94aa459c2c04359d4059daf1496d04a':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 10:02:54 +0000 (10:02 +0000)]

am c1efd41f: (-s ours) Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

* commit 'c1efd41f3f20d0594834adde4649c762773f931f':
Fix build breakage caused by I5ebe0438019958d883a7fda6bd92ea4484211d23 (AOSP)

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 10:02:46 +0000 (10:02 +0000)]

am 63cd28af: (-s ours) am 2c1a22d9: Merge changes I85106f37,I7db398aa into mnc-dev

* commit '63cd28afc398a8f26dc3eed0404ff8f26b04a5c6':

commit | commitdiff | tree

Paul Mclean [Thu, 27 Aug 2015 10:02:39 +0000 (10:02 +0000)]

am f89aedbf: (-s ours) am 8eaf18b0: Merge "Documenting behavior of returning a 0-length array for formats, channels, rates queries for analog devices." into mnc-dev

* commit 'f89aedbf8b63bc92da2c5957402d164e04a9e891':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 10:02:31 +0000 (10:02 +0000)]

am 047fe2a7: (-s ours) am 881cd155: Merge "MidiManager: use ConcurrentHashMap" into mnc-dev

* commit '047fe2a721174d0df26113b4b4d3780b7a177f5b':

commit | commitdiff | tree

Vladislav Kaznacheev [Thu, 27 Aug 2015 10:02:24 +0000 (10:02 +0000)]

am af0a6184: (-s ours) am 8cc00243: Merge "Keep OverScroller.SplineOverScroller state consistent." into mnc-dev

* commit 'af0a61845615c47800e2de0f26c848fe6f3a136c':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 10:02:14 +0000 (10:02 +0000)]

am eb24da62: (-s ours) am 3383b141: am a024acb8: Merge "Let findSupportedAbi and hasRenderscriptBitcode scan only relevant files"

* commit 'eb24da62ac2556e828ced32a554f69f16cbb7c38':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 10:02:04 +0000 (10:02 +0000)]

am 3c9ec351: (-s ours) am db221acc: Merge "Reduce log spam for the ease of debugging Bug 22857361." into mnc-dev

* commit '3c9ec351f179eef81bd625e0e3112e73bedb35ae':

commit | commitdiff | tree

Ajay Panicker [Thu, 27 Aug 2015 10:01:51 +0000 (10:01 +0000)]

am 7324b151: (-s ours) am cda6e878: Implement Bluetooth settings factory reset (2/5)

* commit '7324b1517cf921e0791bcfd8fb701c5dad7e55ff':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 10:01:36 +0000 (10:01 +0000)]

am 69abbe45: (-s ours) am e72377e1: Merge "Fix app ops regressions introduced by the per UID policy change" into mnc-dev

* commit '69abbe457106b5e0652b1ad1879dfdca33968e91':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 10:01:17 +0000 (10:01 +0000)]

am 701a36d5: (-s ours) am bce3eb22: Merge "Fix incorrect default wifi power draw values" into mnc-dev

* commit '701a36d594ac9defd46a2010760a8e600e3b529f':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 10:01:04 +0000 (10:01 +0000)]

am 16c4e75e: (-s ours) am ab868eff: Merge "Update javadoc for EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE" into mnc-dev

* commit '16c4e75e828c050cf395bd70bfd474ad7ce33241':

commit | commitdiff | tree

Makoto Onuki [Thu, 27 Aug 2015 10:00:44 +0000 (10:00 +0000)]

am fe6964e4: (-s ours) am 86ee3a57: Merge "READ_SMS allows getLine1Number() [1/3]" into mnc-dev

* commit 'fe6964e4550e88f5cc830b9944db62201b8c8ec5':

commit | commitdiff | tree

Niels Egberts [Thu, 27 Aug 2015 10:00:34 +0000 (10:00 +0000)]

am 94b5278e: (-s ours) am 6bdc4637: Merge "NPE occured when trying to parcel voice features." into mnc-dev

* commit '94b5278e6587e9d62398eb3bc5b31218363c86b7':

commit | commitdiff | tree

Ian Pedowitz [Thu, 27 Aug 2015 10:00:25 +0000 (10:00 +0000)]

am df27f4b4: (-s ours) am df5a6611: Merge "Revert "Revert "Permissions: GET_ACCOUNTS permission cleanup""" into mnc-dev

* commit 'df27f4b48204d3166b8e945b23c3e83a81fb1e6f':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 10:00:17 +0000 (10:00 +0000)]

am 66625ff1: (-s ours) am dbc4edcc: Merge "Fix NOT_RESTRICTED network capability and enforce it." into mnc-dev

* commit '66625ff19266cf0b5b8d7fa700c996edb89b457f':

commit | commitdiff | tree

Roozbeh Pournader [Thu, 27 Aug 2015 10:00:10 +0000 (10:00 +0000)]

am e32d00aa: (-s ours) am 519adb50: Merge "Create a special CONSTRAINED font bucket in frameworks." into mnc-dev

* commit 'e32d00aae61a94fab60caae8f8c477d5dea4022a':

commit | commitdiff | tree

xin He [Thu, 27 Aug 2015 10:00:02 +0000 (10:00 +0000)]

am 5e5ac5d8: (-s ours) am 54cea234: Merge "Boot loop when SSID has non UTF-8 character in the name" into mnc-dev

* commit '5e5ac5d8a1e79527ebbd7e7316316d7bf308b18e':

commit | commitdiff | tree

Jae Seo [Thu, 27 Aug 2015 09:59:53 +0000 (09:59 +0000)]

am ea0483c4: (-s ours) am 2094a702: Merge "Unregister the existing callback when MediaProjection stops" into mnc-dev

* commit 'ea0483c4a70ee22c3b65f67b363f880f4f401b5f':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:59:42 +0000 (09:59 +0000)]

am b6117765: (-s ours) am 0d616883: Merge "Fix moving of apps into legacy ASEC." into mnc-dev

* commit 'b6117765cdd7b5c59453366ae2ccb287e530b21b':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 09:59:25 +0000 (09:59 +0000)]

am cae230a4: (-s ours) am 52d3312a: Merge "Make ResourceKey always use non-null configuration override." into mnc-dev

* commit 'cae230a4e37b77310b6980016e90f54be49fd044':

commit | commitdiff | tree

Mitchell Wills [Thu, 27 Aug 2015 09:59:07 +0000 (09:59 +0000)]

am bb4fd900: (-s ours) am 385dfd34: Merge "Charge apps for wifi tx time while scanning" into mnc-dev

* commit 'bb4fd9009e0cf91ba68ca0192486045843658e7e':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 09:58:47 +0000 (09:58 +0000)]

am 49193063: (-s ours) am 78b8d4aa: Mark missed calls as read in calllog restore(2/2)

* commit '4919306343e3798ff8fb4f4d95595b038e8289a5':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:58:10 +0000 (09:58 +0000)]

am 17dafd60: (-s ours) am 906c8dea: am bc04d3ac: Merge "animateNoDamage failed to remove from current frame list"

* commit '17dafd60336e4c942280f446aa9b1adf0fd96c62':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 09:57:47 +0000 (09:57 +0000)]

am b98166c6: (-s ours) am fc5a4bf0: Merge "AudioService: check for audio device connection success" into mnc-dev

* commit 'b98166c642c24538e3223305f6f7454928e59e00':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:57:21 +0000 (09:57 +0000)]

am 666f3194: (-s ours) am 2fa3eec0: am 93c14069: Merge "hwui: add extension to support unpack operations in OpenGL ES 2.0"

* commit '666f319443498cb206fd33b613361e3e1fb69b69':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:57:03 +0000 (09:57 +0000)]

am b1ed7e19: (-s ours) am ce68917c: Merge "Ensure per package and per UID state share same package settings." into mnc-dev

* commit 'b1ed7e19837ba60b70e8f98e44f83dcf372552fa':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 09:56:50 +0000 (09:56 +0000)]

am 1fdac7a8: (-s ours) am 2d34a8b7: Merge "Revert "Do not forceLayout when window is resized"" into mnc-dev

* commit '1fdac7a859416da43db49a7b65c487b53f9c5350':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 09:56:39 +0000 (09:56 +0000)]

am 5fa85ce6: (-s ours) am 97b68bbe: Merge "UsbDeviceManager: fix b/21429947 regression (try #2)" into mnc-dev

* commit '5fa85ce6f818f97d5c60b8ccdfe84b337fb3f732':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:56:24 +0000 (09:56 +0000)]

am 5fe0aac6: (-s ours) am 70e5db94: Merge "Fix crash in kModeProcessNoContext" into mnc-dev

* commit '5fe0aac688cc68385ebcc60078c48d2c1694ce79':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 09:56:13 +0000 (09:56 +0000)]

am c530e778: (-s ours) am 35a1a209: Merge "Include dnd status in bugreports." into mnc-dev

* commit 'c530e77831b3cf1b5dfaa03cb06f812160941fb3':

commit | commitdiff | tree

Matthew Williams [Thu, 27 Aug 2015 09:56:01 +0000 (09:56 +0000)]

am 0a4af7ad: (-s ours) am d6ef2313: am 0c53f72e: Merge "Fix NPE in JobStore when jobs.xml is empty."

* commit '0a4af7adebe4230e7c258b5e35f953db0ffe1f40':

commit | commitdiff | tree

Matthew Williams [Thu, 27 Aug 2015 09:55:38 +0000 (09:55 +0000)]

am 7d4c58f7: (-s ours) am fad3c663: Merge "Remove spurious syncmanager wake-ups" into mnc-dev

* commit '7d4c58f7267138cdbf650510389330dd45803d2d':

commit | commitdiff | tree

Ian Pedowitz [Thu, 27 Aug 2015 09:55:18 +0000 (09:55 +0000)]

am 93919ff1: (-s ours) am 845d14db: Revert "Permissions: GET_ACCOUNTS permission cleanup"

* commit '93919ff1fc9be98a4f314cd2600960d1ef5c207c':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 09:54:49 +0000 (09:54 +0000)]

am 9fdff2e5: (-s ours) am b2690f38: Merge "Fail silently if a process trys to launch an acitvity for background user" into mnc-dev

* commit '9fdff2e5431d20429ec47f760a5cf1ef5fc5eafc':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 09:54:08 +0000 (09:54 +0000)]

am 26085a0a: (-s ours) am 55dbf2d7: Merge "QS: Allow Flashlight Tile to handle reset state" into mnc-dev

* commit '26085a0aac218a255298d682f5f7a0df9c7de261':

commit | commitdiff | tree

Pavlin Radoslavov [Thu, 27 Aug 2015 09:53:42 +0000 (09:53 +0000)]

am 040e5771: (-s ours) am 29b8c4ab: Reset the pointer to the Bluetooth GATT service

* commit '040e5771c14e0880c4a39d761eb897fcb3071c7d':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:53:18 +0000 (09:53 +0000)]

am e8585a23: (-s ours) am 59d72c86: Merge "BatteryStats: Add debug logging to find source of b/22716723" into mnc-dev

* commit 'e8585a23de53cb98ca0a8999ab9f685bc279ac16':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:52:58 +0000 (09:52 +0000)]

am 6835ef09: (-s ours) am d9b0f843: Merge "Fix issue #22860466: viapi security bug - rubber stamping in nested VIs" into mnc-dev

* commit '6835ef095acdfbab93a939e0164beb3a0c925708':

commit | commitdiff | tree

Prem Kumar [Thu, 27 Aug 2015 09:52:44 +0000 (09:52 +0000)]

am 7fdd006d: (-s ours) am 04e2cf6b: Merge "Make default selection for contact sharing to "Checked"." into mnc-dev

* commit '7fdd006d2a0b31ac39a0444045ebb43023b81f14':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 09:52:32 +0000 (09:52 +0000)]

am 97eb60a6: (-s ours) am 911bd0d3: Merge "Set broadcast nextReceiver correctly when package is disabled" into mnc-dev

* commit '97eb60a68e555336a30c138aee23a18c5a0498d7':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:52:17 +0000 (09:52 +0000)]

am 5d0c84bd: (-s ours) am c03ab87a: Merge "Disable skipping frames on empty damage" into mnc-dev

* commit '5d0c84bd7f793d5ecb6d6c446f978fa8ee9a2493':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:51:52 +0000 (09:51 +0000)]

am b2972dbd: (-s ours) am ac8c9861: Merge "Notify settings URI change without a lock held" into mnc-dev

* commit 'b2972dbd75fa6c401405ae21a61bdd0df6b91cf4':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:51:25 +0000 (09:51 +0000)]

am a7b80741: (-s ours) am 3011f645: Merge "Fix issue #22912704: "android.process.acore has stopped" dialog keeps popping up" into mnc-dev

* commit 'a7b8074191e6ab50184691df9cfeb96034717b4d':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:51:00 +0000 (09:51 +0000)]

am 10fdfb18: (-s ours) am 7290d93d: Merge "Yell loudly about undefined behind in Bitmap, but work anyway" into mnc-dev

* commit '10fdfb18152d9b7e0f1757c503e9829e40d3eeee':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:50:40 +0000 (09:50 +0000)]

am 275d41d0: (-s ours) am 0faca96f: Merge "Avoid deadlock by broadcasting outside lock." into mnc-dev

* commit '275d41d0a19b9be702f8512fc87e1817525c7475':

commit | commitdiff | tree

Matthew Williams [Thu, 27 Aug 2015 09:50:27 +0000 (09:50 +0000)]

am d13667e3: (-s ours) am b3448bf1: am 608ad140: Merge "Idle Job Start During SCREEN_ON or DREAMING_STOPPED"

* commit 'd13667e31dc0189b477fede4963b7c1f8379f3c2':

commit | commitdiff | tree

Diego Perez [Thu, 27 Aug 2015 09:50:16 +0000 (09:50 +0000)]

am 16a1c9e1: (-s ours) am 405eceb2: Merge "Restore session params "no decoration" flag" into mnc-dev

* commit '16a1c9e19b67bfd75b7d8b6d00d7cf22e1ab4615':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 09:50:05 +0000 (09:50 +0000)]

am fecb60f1: (-s ours) am d985e3b6: Merge changes Ib5f53f3b,I7debf3ee,Ic494ee7f,Ia8d223ae,Iff7dbbf6 into mnc-dev

* commit 'fecb60f1a7f449ac99d4fe047bcc0bf9dbb48950':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:49:53 +0000 (09:49 +0000)]

am e2faac0a: (-s ours) am 3ba2bfa7: Merge "Expand ringtone titles to support OGG and FLAC." into mnc-dev

* commit 'e2faac0a13081d4342e0c75c33abfa253290acdf':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 09:49:38 +0000 (09:49 +0000)]

am 2031adff: (-s ours) am f8576979: Merge "Also consider task intent when trimming recent tasks" into mnc-dev

* commit '2031adffb8936dcb8d8f9c8b4668cd2ae50d44b8':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 09:49:24 +0000 (09:49 +0000)]

am 183aa948: (-s ours) am 7b4170fa: Merge "Update Material link text to be colorAccent" into mnc-dev

* commit '183aa948be9f8b5169ea4281421c8ee90d2634b7':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 09:49:11 +0000 (09:49 +0000)]

am cd1e7f7b: (-s ours) am 45fcaa54: Merge "Don\'t wipe device because of short PIN, patterns or passwords" into mnc-dev

* commit 'cd1e7f7b9446413f073f35fa9dd3c944811f3e6a':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 09:48:53 +0000 (09:48 +0000)]

am 5be6cc6d: (-s ours) am ef3f58e5: Merge "Make ResolverDrawerLayout look like a ScrollView to accessibility" into mnc-dev

* commit '5be6cc6db941ce5756743191366f2a8b9c2e3b2f':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 09:48:41 +0000 (09:48 +0000)]

am 7b77b284: (-s ours) am e76bf46a: Merge "Add badge content description to TargetInfo, use in ResolverActivity" into mnc-dev

* commit '7b77b284dece5d3049c1fe8d826a5172485c9b28':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 09:48:28 +0000 (09:48 +0000)]

am 82330790: (-s ours) am 5680f9f6: Merge "Bug: 22879202 App compatibility with WRITE_SETTINGS failing" into mnc-dev

* commit '82330790940a640e8a5c03bcb02a8ee7c8212174':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:48:15 +0000 (09:48 +0000)]

am 051a70e1: (-s ours) am 87920455: Merge "Fix NPE in AppOpsService" into mnc-dev

* commit '051a70e1643c42523c5d80efd897f67700c17281':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:48:03 +0000 (09:48 +0000)]

am aec40925: (-s ours) am 0855357c: Merge "User correct category for finding headless sync adapters" into mnc-dev

* commit 'aec40925b5cb00bd243bdf3e4707fb9bad39fd98':

commit | commitdiff | tree

Lajos Molnar [Thu, 27 Aug 2015 09:47:51 +0000 (09:47 +0000)]

am a0426ee2: (-s ours) am 0ca1e98f: Merge "media: Clarify MediaCodec and CodecCapabilities documentation" into mnc-dev

* commit 'a0426ee22ffbfdac7ee25815516c9d22631767e2':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 09:47:40 +0000 (09:47 +0000)]

am 9f485905: (-s ours) am 772c6c0d: am 40f0efe0: Merge "Add a trace constant for PackageManager"

* commit '9f48590554979f137bac7505a146508d168eed7f':

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Aug 2015 09:47:30 +0000 (09:47 +0000)]

am 7cf5a0f6: (-s ours) am 7469060e: Merge "Make vendor keys visible in Camera2 java APIs." into mnc-dev

* commit '7cf5a0f698a4c0ad109581fb4c6087c740976226':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 09:47:18 +0000 (09:47 +0000)]

am 93053a8e: (-s ours) am 66845a36: Add more dump info about emergency calls state

* commit '93053a8e1991b5a47c5f99961554704aae172005':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:47:06 +0000 (09:47 +0000)]

am 52f805e4: (-s ours) am 8dbd4848: Merge "Add per UID control to app ops." into mnc-dev

* commit '52f805e4b1a076e5d205822e3c6ab33609b5e163':

commit | commitdiff | tree

Jan Nordqvist [Thu, 27 Aug 2015 09:46:50 +0000 (09:46 +0000)]

am 12836594: (-s ours) am cb9c0940: Merge "Added logging in a few error paths for wifi config installation." into mnc-dev

* commit '128365943a089dcf03e082e9f64024d119a9e6dc':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 09:46:32 +0000 (09:46 +0000)]

am 6fe94248: (-s ours) am 6e75e7dd: Merge "Instrument printing service for metrics collection." into mnc-dev

* commit '6fe94248373da7aeb3386c40ca0c6ce441b676a9':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 09:46:12 +0000 (09:46 +0000)]

am 54f9a21a: (-s ours) am f92a1fdb: Fixed a bug where notifications shadows were blinking out

* commit '54f9a21a440d16c63668b82796febaf990d7a82f':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 09:45:48 +0000 (09:45 +0000)]

am c2369c53: (-s ours) am b98e2353: am 158560ad: Merge "Distinguish user-requested shutdown from power-related ones"

* commit 'c2369c5301c489195daa25894ea838cfa7f2a661':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 09:45:33 +0000 (09:45 +0000)]

am ce09247b: (-s ours) am 00ab3578: Merge "Make enter reveal animation be zorder top." into mnc-dev

* commit 'ce09247b6f5dfbf64f3e5e0a7f1a374e64583620':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:45:23 +0000 (09:45 +0000)]

am e3047ddc: (-s ours) am fb68b0ad: Merge "Fix issue #21895842: Add is_assist_blocked to assist.ViewNode.NodeProperties" into mnc-dev

* commit 'e3047ddcceeed9c0c54775ef916529526db1bcea':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 09:45:13 +0000 (09:45 +0000)]

am c5827cec: (-s ours) am ffbdb8ad: Merge "Fix that shutter sound does not play after ringer mode changes to vibrator" into mnc-dev

* commit 'c5827cec8e29a6031ec5092f94e2b67bda1117bc':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 09:45:05 +0000 (09:45 +0000)]

am 51a8fe95: (-s ours) am 5cca30a4: Merge "Revert two changes to LinearLayout measurement" into mnc-dev

* commit '51a8fe950efb67e23b7bb64719322c0a7b415367':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 09:44:56 +0000 (09:44 +0000)]

am d4c8f2a5: (-s ours) am 9d8a230f: Revert "View measurement optimization"

* commit 'd4c8f2a5e632df2c07587d5717eb017e9f459389':