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

Jim Miller [Thu, 27 Aug 2015 19:20:32 +0000 (19:20 +0000)]

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

* commit 'a5094db1a83e077e2075942c3925b8806f34cbcb':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:20:24 +0000 (19:20 +0000)]

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

* commit '5d0ad98555727bfda35240e438884056c6de8904':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:20:12 +0000 (19:20 +0000)]

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

* commit '405f297671705ef9e86e44d36e4df793c3be04f6':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 19:19:58 +0000 (19:19 +0000)]

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

* commit '9bcb60c6db2212c26b724562ce4d2aa820c2f886':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 19:19:29 +0000 (19:19 +0000)]

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

* commit '5d8b6de0a9d5e9a1d69322c06173e55f90559006':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 19:18:55 +0000 (19:18 +0000)]

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

* commit '567d9a312af5112e728ec9761e0a6ae8d4dbfa23':

commit | commitdiff | tree

Lajos Molnar [Thu, 27 Aug 2015 19:18:17 +0000 (19:18 +0000)]

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

* commit '9d05ec892e7bf579021e07805317bc4006a4f407':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 19:17:50 +0000 (19:17 +0000)]

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

* commit '47447567928bccbf594911cdf44184db73524fcd':

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Aug 2015 19:17:24 +0000 (19:17 +0000)]

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

* commit 'c378818f90eb9b477a3b4bf814b1eed08e8f7168':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 19:17:08 +0000 (19:17 +0000)]

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

* commit '69eeff95f3ba854f05e9567c0aed9a81c33ff873':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 19:16:56 +0000 (19:16 +0000)]

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

* commit '6f388544472fe2158c5d1b1ba89d3783e1cee4e2':

commit | commitdiff | tree

Jan Nordqvist [Thu, 27 Aug 2015 19:16:44 +0000 (19:16 +0000)]

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

* commit '904fae414a3f28573ce78cb9e89dc2358552e0c0':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 19:16:31 +0000 (19:16 +0000)]

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

* commit 'ec0f0d80d60dea272440439f855b888d7d5df032':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 19:16:15 +0000 (19:16 +0000)]

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

* commit '8e440ca1f434f4c6efcfbeb78cda424414ecd609':

commit | commitdiff | tree

Yusuke Sato [Thu, 27 Aug 2015 19:15:46 +0000 (19:15 +0000)]

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

* commit '08c8179069121820b971b14850474613a03cdc3b':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 19:15:20 +0000 (19:15 +0000)]

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

* commit 'a314af742304c86cd5f108592b586d14c3bf40e8':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:14:47 +0000 (19:14 +0000)]

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

* commit 'b34fc71c83a5f3adbc7e68f93c8e2c72de7d5881':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 19:14:16 +0000 (19:14 +0000)]

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

* commit '9bbad697091ce07560337810461508178ecc763f':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:13:47 +0000 (19:13 +0000)]

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

* commit 'a4a3c81e6ba7a2e7c4c2e075cf1ab28a06a08b5a':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:13:25 +0000 (19:13 +0000)]

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

* commit '5043aedb45a51d4d0b7ae1abbb2d914933b0bb66':

commit | commitdiff | tree

Winson Chung [Thu, 27 Aug 2015 19:13:00 +0000 (19:13 +0000)]

am 11db2375: am 7a8f112c: (-s ours) am c35e670d: Moving removeTask to separate thread.

* commit '11db23759dc7605f2a776c5945cc7c5b94c46558':

commit | commitdiff | tree

Winson Chung [Thu, 27 Aug 2015 19:12:44 +0000 (19:12 +0000)]

am b6111f2b: am e335de61: (-s ours) am 92e0c86f: Merge "Ensuring that we don\'t try to use and propagate null activity labels." into mnc-dev

* commit 'b6111f2b73c4fa1e4027e532549607dc23d65d60':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 19:12:30 +0000 (19:12 +0000)]

am 34fbe101: am df45e1b2: (-s ours) am e836a229: Fix build.

* commit '34fbe1015501bb90478b45f3d87884a83c2533db':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 19:12:13 +0000 (19:12 +0000)]

am b4fa3849: am c274a207: (-s ours) am f7e00dbd: Merge "Fixed issue with artifacts during scale-up transition animation" into mnc-dev

* commit 'b4fa38492f9d5f5aedca8905826eee9ed07eade7':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:12:00 +0000 (19:12 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 19:11:47 +0000 (19:11 +0000)]

am 768d1b35: am b1dc3441: (-s ours) am ebbc891a: Merge "Fix build." into mnc-dev

* commit '768d1b356f890bcf3400278ee0089435407609dc':

commit | commitdiff | tree

Vadim Tryshev [Thu, 27 Aug 2015 19:11:36 +0000 (19:11 +0000)]

Merge "Removing profile's pinned apps upon a profile removal."

commit | commitdiff | tree

Glenn Kasten [Thu, 27 Aug 2015 19:11:18 +0000 (19:11 +0000)]

am efb76c88: am 30981ed5: (-s ours) am 37f559be: Merge "Improve getTimestamp documentation" into mnc-dev

* commit 'efb76c88a77c02dd6b5cd45a7d8934a91f93676b':

commit | commitdiff | tree

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

am 0c5c96cb: am e07a0602: (-s ours) am 692a244b: Fix build.

* commit '0c5c96cb91d3ee76d38c775ec49b1abc43c23d97':

commit | commitdiff | tree

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

am 58e1dd11: am c14e670c: (-s ours) am c1836bb0: Merge "Change MNC codename to just M." into mnc-dev

* commit '58e1dd11f422e8be0acd71c4d0beedebb9eb2464':

commit | commitdiff | tree

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

am 7db437d2: am f2269f04: (-s ours) Change MNC codename to just M.

* commit '7db437d29ca3ea42b427d7317c86dea88cb619bd':
Change MNC codename to just M.

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Aug 2015 19:10:09 +0000 (19:10 +0000)]

am 4f273780: am 384fc141: (-s ours) am d0694da4: Merge "Add telecom extra keys required for DMR release." into mnc-dev

* commit '4f27378031afce7ccd87b6f8289941b61597ac15':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 19:09:59 +0000 (19:09 +0000)]

am 3425f463: am 77978934: (-s ours) am 5d6a2d38: Merge "Fix SysUI crash on device boot." into mnc-dev

* commit '3425f46391389491951f05ac98fabb35012f3517':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 19:09:48 +0000 (19:09 +0000)]

am f7a301f0: am 19f7007b: (-s ours) am 9a81a182: Merge "Don\'t always transfer device owner status to other users." into mnc-dev

* commit 'f7a301f06c0ef5a0e34c00f783fd8487f48885de':

commit | commitdiff | tree

Benjamin Franz [Thu, 27 Aug 2015 19:09:28 +0000 (19:09 +0000)]

am b94777c7: am eb83e998: (-s ours) am d692fcf1: Merge "Add missing return statement" into mnc-dev

* commit 'b94777c7f6a6dc62e0d1de27244519587cc5b261':

commit | commitdiff | tree

Lorenzo Colitti [Thu, 27 Aug 2015 19:09:11 +0000 (19:09 +0000)]

am b5ea4712: am be265a2b: (-s ours) am 496a9d26: Merge "Stop supporting legacy ConnectivityManager routing methods in M." into mnc-dev

* commit 'b5ea471201baeed21f927c545cbc09c5272a6292':

commit | commitdiff | tree

Dave Langemak [Thu, 27 Aug 2015 19:08:41 +0000 (19:08 +0000)]

am 6d86c6fb: am 4f3b189e: (-s ours) am 02565c36: Merge changes from topic \'fix-notification-inflation-2\' into mnc-dev

* commit '6d86c6fb9d9cf60e5fdda39c0dc3ab1ad7c4c553':

commit | commitdiff | tree

Hung-ying Tyan [Thu, 27 Aug 2015 19:08:11 +0000 (19:08 +0000)]

am 8613bcdf: am 8be74fae: (-s ours) am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit '8613bcdf9efaf1ae1fc31b2a22f0787668f13bf2':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 19:07:43 +0000 (19:07 +0000)]

am 2f3c72b9: (-s ours) am c8dcee0f: (-s ours) am bbb47d88: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '2f3c72b977efe0fab18cff7c8ab35e7847953841':

commit | commitdiff | tree

Ronghua Wu [Thu, 27 Aug 2015 19:07:27 +0000 (19:07 +0000)]

am e7baf7f8: am db29b894: (-s ours) am e8b7febd: Merge "media: use blocks number to find closest size" into mnc-dev

* commit 'e7baf7f830714aa3fa8d4ed5bb93247a195304a9':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 19:07:15 +0000 (19:07 +0000)]

am c20c0eee: am 1ff0d50c: (-s ours) am 5db4cc8f: Merge "Handle volumes without visible paths." into mnc-dev

* commit 'c20c0eee8461542316e17f27efef6a982f2e55c6':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 19:07:05 +0000 (19:07 +0000)]

am 45732432: am 10730b69: (-s ours) am e3b0119f: Merge "AAPT: Fix resource versioning" into mnc-dev

* commit '45732432a136fcb9eab9ab97d2929c2c913801f6':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 19:06:54 +0000 (19:06 +0000)]

am a8f22b80: am c0d9c0c1: (-s ours) am b9f30b26: Merge "The heads up now correctly dissapears when clicking" into mnc-dev

* commit 'a8f22b8024b4d2abfa53d7b25ea97a0c2adcbf93':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 19:06:43 +0000 (19:06 +0000)]

am b52413ce: am 8ca5a84a: (-s ours) am 53c75014: Merge "Add OrSelf to privileged permission check." into mnc-dev

* commit 'b52413ceebc03716beffe1122025d6648474c4cf':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 19:06:31 +0000 (19:06 +0000)]

am 4839117e: am 1c023b5a: (-s ours) am 00f7cb92: Merge "BatteryStats: include mobile radio active count and unknown time in checkin" into mnc-dev

* commit '4839117eba041eaacf6153aa75e1e82a71cb22e2':

commit | commitdiff | tree

Andre Eisenbach [Thu, 27 Aug 2015 19:06:22 +0000 (19:06 +0000)]

Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base

commit | commitdiff | tree

Andre Eisenbach [Thu, 27 Aug 2015 19:06:02 +0000 (19:06 +0000)]

am c8bbac47: am 4a622aa9: (-s ours) am 3bf1ac54: Bluetooth: Don\'t call beginBroadcast() while in a broadcast

* commit 'c8bbac47f4069a53b07bf36c6052e89eb2c6b917':

commit | commitdiff | tree

Stefan Kuhne [Thu, 27 Aug 2015 19:05:59 +0000 (19:05 +0000)]

Merge "Dont update thumbnails of freeform windows on focus change"

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 19:05:42 +0000 (19:05 +0000)]

am 42fc0b71: am b9441edd: (-s ours) am 26ae600b: Merge "Permissions: GET_ACCOUNTS permission cleanup" into mnc-dev

* commit '42fc0b71f6444b594ed1489bca130f6405c51e3f':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 19:05:16 +0000 (19:05 +0000)]

am 3ec11464: am a1e1d142: (-s ours) am 7676e403: Merge changes I4c215676,Ib476302c,I0aede288,I9241dec7,Ibe7167a6, ... into mnc-dev

* commit '3ec11464606af6f192da91391d02fb0635672f03':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 19:04:53 +0000 (19:04 +0000)]

am b956c53c: am 758a28d4: (-s ours) am 20a5d331: Merge "Fixed a heads up crash" into mnc-dev

* commit 'b956c53c604ede403bce065919f937cf8b9cffac':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 19:04:38 +0000 (19:04 +0000)]

am bc763696: am 65e6e984: (-s ours) am 8f5228af: Merge "UsbMidiDevice: add timestamps for input events" into mnc-dev

* commit 'bc7636961fddb6a3968e03104c6545ebbca59a59':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 19:04:26 +0000 (19:04 +0000)]

am fdaeb1a7: am 1742d926: (-s ours) am 2f1a08e6: Merge "MIDI docs BTLE: how to open BTLE MIDI devices" into mnc-dev

* commit 'fdaeb1a72316f9157a3e82cd1c23cc4897902a95':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 19:04:15 +0000 (19:04 +0000)]

am 70922651: am f6615376: (-s ours) am fdcd8216: Merge "MIDI package doc: add hasSystemFeature() call" into mnc-dev

* commit '70922651c87f7312e4c80c50891681e650215aaf':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 19:04:07 +0000 (19:04 +0000)]

am b5d922f5: am 0f1014ae: (-s ours) am 559a2420: Merge "MidiDevice: document that opens can return nulls" into mnc-dev

* commit 'b5d922f5f44393d553fd2334d5c93f66c9fd2fd0':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 19:03:58 +0000 (19:03 +0000)]

am 3831d56c: am 123a9f93: (-s ours) am 4988378c: Merge "Introduced android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit '3831d56c961b169d2cd14a0e43822036bd3df9ef':

commit | commitdiff | tree

Shawn Willden [Thu, 27 Aug 2015 19:03:50 +0000 (19:03 +0000)]

am 4eebf1a7: am 3d4b9655: (-s ours) am 75e51ec0: Merge "Raw RSA Cipher relies on keymaster for padding and range checks." into mnc-dev

* commit '4eebf1a7f4721e444472d5463dc6c4d5230f35b0':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 19:03:42 +0000 (19:03 +0000)]

am b36291fb: am dd497cab: (-s ours) am 730c0f65: Merge "Fix stencil mask usage in HWUI" into mnc-dev

* commit 'b36291fbac4de8198a19f2000881c5a64ec4600e':

commit | commitdiff | tree

Shishir Agrawal [Thu, 27 Aug 2015 19:03:32 +0000 (19:03 +0000)]

am e735236f: am e43beb5d: (-s ours) am 8d1d8fda: Merge "Add SMS permissions for Carrier app." into mnc-dev

* commit 'e735236f7afd286771b97654ad21d4d95e6f23b5':

commit | commitdiff | tree

Vadim Tryshev [Thu, 27 Aug 2015 00:52:48 +0000 (17:52 -0700)]

Removing profile's pinned apps upon a profile removal.

Bug: 20024603
Change-Id: I4b17bffe202d3f4cf211b3289ee021c4ec16e91f

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 19:03:21 +0000 (19:03 +0000)]

am f3fd110b: am ba0d1eef: (-s ours) am 74a0744e: Merge "Fix issues around process teardown after full-data restore" into mnc-dev

* commit 'f3fd110bb6bce372dd8afc2490190749d06fb713':

commit | commitdiff | tree

Simranjit Kohli [Thu, 27 Aug 2015 19:03:03 +0000 (19:03 +0000)]

am c76b4642: am 826d5aca: (-s ours) am 964a4121: Merge "[Improve docs for AccountManager] Currently, the docs for AccountManager are somewhat misleading and may cause developer errors. To avoid them, we are properly documenting it." into mnc-dev

* commit 'c76b46429383c74b851f40bd873c29396ef91585':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:02:45 +0000 (19:02 +0000)]

am 4a369344: am ca5fb5c3: (-s ours) am 559daf7a: Merge "Include non-zero dimension views in excess space calculation" into mnc-dev

* commit '4a369344a9aa9c1e78410ae60e379da11620b581':

commit | commitdiff | tree

Dan Sandler [Thu, 27 Aug 2015 19:02:19 +0000 (19:02 +0000)]

am bc90e171: am b18c2c42: (-s ours) am 7bd8e6a8: DateTimeView: don\'t assume you have an ApplicationContext.

* commit 'bc90e171337fbaf10879f47703d6f7133f1b6089':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 19:02:02 +0000 (19:02 +0000)]

am f9bbb112: am a83fb6f6: (-s ours) am c1d5b6c1: Merge "Move padding from navigation and overflow icons to Toolbar" into mnc-dev

* commit 'f9bbb112b8bb4acd0f52e2f6e7fe84dfa744dac0':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 19:01:49 +0000 (19:01 +0000)]

am 9f3426a8: am d065fd41: (-s ours) am 204b4157: am f8a6a2f6: Merge "Use _WIN32 rather than HAVE_WINSOCK."

* commit '9f3426a83db9aea16fd90e7c531a87d55ed7b81b':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 19:01:36 +0000 (19:01 +0000)]

am fbdd8b59: am 0c152b9e: (-s ours) am 30c5da9c: Don\'t call cancel() when fingerprint auth fails

* commit 'fbdd8b59dc7f7c12c967d89c1ac3a2273d566f24':

commit | commitdiff | tree

Daniel Sandler [Thu, 27 Aug 2015 19:01:26 +0000 (19:01 +0000)]

am eef5d8de: am b10d22ff: (-s ours) am bbe1682b: Merge changes from topic \'fix-media-notifications\' into mnc-dev

* commit 'eef5d8de0834156c5d2583b222c624b353fc9ca5':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 19:01:19 +0000 (19:01 +0000)]

am 89fd13dc: am d732799a: (-s ours) am a991c66c: Merge "Fix missing onLost NetworkCallbacks when network loses capability" into mnc-dev

* commit '89fd13dc628c1e33de492f3ce96844e121302c1c':

commit | commitdiff | tree

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

am 3e9d32d3: am 98169db3: (-s ours) am 8d3a67a8: Merge "More maybe fix issue #22765972: Binder transactions running out..." into mnc-dev

* commit '3e9d32d3a5bfebf8f96f1bfa87464bb5af2bd125':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 19:00:58 +0000 (19:00 +0000)]

am 1fbb06f6: am 710091b1: (-s ours) am beb3185f: Merge "Fix touch target for settings icon" into mnc-dev

* commit '1fbb06f6a7f2d4de11668ad5f46481cfc593ae72':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 19:00:40 +0000 (19:00 +0000)]

am 2c7ea6ed: am e987d609: (-s ours) am 26aa04c3: Fix state weirdness in the panel

* commit '2c7ea6edf51fd1369a374c7948ebccd556df9fbc':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 19:00:20 +0000 (19:00 +0000)]

am ee0d0692: am e6286724: (-s ours) am e528f048: am 84a04d52: Merge "Move frameworks/base/tools/ off AndroidConfig.h."

* commit 'ee0d0692502312caec57e3bf590e41aebc0df530':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:59:53 +0000 (18:59 +0000)]

am 84b2ebd3: am f5893c0b: (-s ours) am 95c6daed: Fix doze mode

* commit '84b2ebd35734ff142ed3b33a8286c4eb8efe978c':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 18:59:22 +0000 (18:59 +0000)]

am 43d0afdd: am 96a10552: (-s ours) am e8246ff7: Merge "Fixed out of bounds exception while handling app crash" into mnc-dev

* commit '43d0afdd46cf2960a8dc6fb447edaefebcddddd9':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:58:48 +0000 (18:58 +0000)]

am f337ae0b: am 36a2759f: (-s ours) am 4a0e791c: Workaround View.post issues to fix runtime crash

* commit 'f337ae0b81c30bf980e7b295ce73b5003d3fd85d':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 18:58:18 +0000 (18:58 +0000)]

am da482a2e: am 77bb8143: (-s ours) am a6706627: Merge "Bug: 21589105 Rescope WRITE_SETTINGS permission (framework services perm check changes)" into mnc-dev

* commit 'da482a2ec8b4860168a76f73e1ec3155e6055e95':

commit | commitdiff | tree

Ji Yang [Thu, 27 Aug 2015 18:57:46 +0000 (18:57 +0000)]

am 2dbea73c: am ba29aaf2: (-s ours) am 499f084d: Merge "Add API to let carrier app send SMS without auto perisisting." into mnc-dev

* commit '2dbea73c1028314a87cd3a992e82bc792a65fd70':

commit | commitdiff | tree

Dan Sandler [Thu, 27 Aug 2015 18:57:19 +0000 (18:57 +0000)]

am 85154c01: am b4c12fdb: (-s ours) am 25ffc7ad: Accessibility: Read the time correctly in quick settings.

* commit '85154c011462f25e55a56309200fcf17ecfba55b':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 18:56:55 +0000 (18:56 +0000)]

am c13d1025: (-s ours) am b4a5f7d9: (-s ours) am 771d210a: Merge "Revert "DO NOT MERGE Enhance local log."" into mnc-dev

* commit 'c13d10257da28260c3dd5f9cb2619d14cb79d289':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:56:42 +0000 (18:56 +0000)]

am 1f33e637: am 6f73eb0c: (-s ours) am 393c7fb2: Merge "Default grants: handle update system packages" into mnc-dev

* commit '1f33e6377e8ae5b4d7be716259c0cf75dfed1402':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:56:24 +0000 (18:56 +0000)]

am 0f3ae1b1: am 78406854: (-s ours) am e2cd8419: Merge "Fix pattern lock for accessibility" into mnc-dev

* commit '0f3ae1b10cd4196dabb9c5e4628ccc2c663afd1e':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:55:55 +0000 (18:55 +0000)]

am 1eadf33b: (-s ours) am 7a763bc1: (-s ours) am 93184eef: Merge "DO NOT MERGE: Don\'t backup night mode setting" into mnc-dev

* commit '1eadf33b210e984f9a3c0b8a35dfcd523be8fb0f':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:55:10 +0000 (18:55 +0000)]

am a5a031fe: am bbe80810: (-s ours) am 726d47b7: Merge "Fix and deprecate lock pattern related settings" into mnc-dev

* commit 'a5a031febfce9b97125f8a01817cf36efbbdb6b7':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:54:33 +0000 (18:54 +0000)]

am 11b2e973: am 0322ccf6: (-s ours) am 47a74e7e: Merge "Ensure maxHeight is at least 0 during measureChildHorizontal()" into mnc-dev

* commit '11b2e9731321b403e348181d832696772efcd9c9':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 18:54:00 +0000 (18:54 +0000)]

am ced27b44: am 401de11f: (-s ours) am 5c380efa: Merge "Always distribute excess space in LinearLayout measurement" into mnc-dev

* commit 'ced27b4451b1e4e7497b7c6430a216e954e1fca9':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:53:31 +0000 (18:53 +0000)]

am a10256e6: am 4854d113: (-s ours) am b86048da: Merge "Always return content Uri for downloads." into mnc-dev

* commit 'a10256e658c27757c96e05a5d7e4f8301f95979b':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 18:53:12 +0000 (18:53 +0000)]

am f0e44162: am 9c5a06aa: (-s ours) am c3cc344d: Merge "Release text when finishing StaticLayout.Builder" into mnc-dev

* commit 'f0e44162220c2f494368b96d813e7c2af377b9db':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 18:52:55 +0000 (18:52 +0000)]

am 0010f9dc: am c4887d0f: (-s ours) am 25782ef8: Merge "Added stack id to TaskRecord dump." into mnc-dev

* commit '0010f9dc9f1840024afe90c6a4f94c8d9f8f999b':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 18:52:39 +0000 (18:52 +0000)]

am 5e03f8a5: am d26bc1c0: (-s ours) am 944b6362: Merge "Add a command to register SIM Phone account." into mnc-dev

* commit '5e03f8a537f88269035e55089dc68458979a36a8':

commit | commitdiff | tree

Maurice Lam [Thu, 27 Aug 2015 18:52:17 +0000 (18:52 +0000)]

am d735e26d: am 7ce565f3: (-s ours) am 75d958c4: Merge "Disable launching assist during setup" into mnc-dev

* commit 'd735e26d177e6e28d867d8ae824919fed845566e':

commit | commitdiff | tree

Christine Hallstrom [Thu, 27 Aug 2015 18:51:49 +0000 (18:51 +0000)]

am c8870b81: am 584d6121: (-s ours) am a42e6816: Merge "Change NTP polling interval from 10 days to 24 hours." into mnc-dev

* commit 'c8870b8158ff91a4e2ca4a88f60ad1b97b6cb431':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 18:51:24 +0000 (18:51 +0000)]

am 945f5cbc: (-s ours) am 62e2b84c: (-s ours) am 3986360a: (-s ours) Import translations. DO NOT MERGE

* commit '945f5cbcef07310b69da04d7b26031f5f8803a80':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:51:04 +0000 (18:51 +0000)]

am e31aa5ba: am 862dc4f2: (-s ours) am 9352af2a: Merge "Remove dependencies on the package installer\'s package name" into mnc-dev

* commit 'e31aa5ba0614796f56d7a74bcb5b87613c78e186':

commit | commitdiff | tree

Sailesh Nepal [Thu, 27 Aug 2015 18:50:50 +0000 (18:50 +0000)]

am 33698b01: am 04a69aa1: (-s ours) am 6b96de8d: Merge "Default permissions for sim call manager" into mnc-dev

* commit '33698b01acc1d0fc9916959411cd6f2e0a42a139':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:50:36 +0000 (18:50 +0000)]

am 8699d162: am 7b09e2c0: (-s ours) am a7a65ee4: Merge "Allow non system to set perm policy flags - needed by the installer" into mnc-dev

* commit '8699d16268568dfe1236a03c3c320a420d0d7d53':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:50:23 +0000 (18:50 +0000)]

am 90ec63e0: am 986812a6: (-s ours) am 120a86ac: Merge "Do not reset runtime permissions on upgrade" into mnc-dev

* commit '90ec63e0d17e40b1ca6f90f0d508e6c029ace82a':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:50:11 +0000 (18:50 +0000)]

am c9f3e4e9: am c2a02439: (-s ours) am eda1cc50: Merge "Work on issue #22765972: Binder transactions running out of address..." into mnc-dev

* commit 'c9f3e4e911b5c7263b748520d089fbb302e45c68':

commit | commitdiff | tree

Nicolas Prévot [Thu, 27 Aug 2015 18:49:59 +0000 (18:49 +0000)]

am d0f33090: am 91775db6: (-s ours) am 64ac302f: Merge "Send a public broadcast when the device owner is set." into mnc-dev

* commit 'd0f330904e1acff710964910648cb10738fcfb2f':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 18:49:44 +0000 (18:49 +0000)]

am afad2103: am 49d7d481: (-s ours) am a7e6be68: am 7d71d88c: Merge "Use _WIN32 rather than HAVE_WINDOWS_PATHS."

* commit 'afad21033ee7dd5126936e7d0e5e86bef51b46eb':