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

Jorim Jaggi [Thu, 27 Aug 2015 09:30:13 +0000 (09:30 +0000)]

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

* commit 'f5893c0b72b8c4bdd54f38ee8af5f55f3b975ef9':

Wale Ogunwale [Thu, 27 Aug 2015 09:30:00 +0000 (09:30 +0000)]

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

* commit '96a105522e3f6c0495123904bb5ae058a190c987':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:29:47 +0000 (09:29 +0000)]

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

* commit '36a2759f1806ed03612e8f4a41b18d15cc4a27c3':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 09:29:35 +0000 (09:29 +0000)]

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

* commit '77bb814318e9ca89b7b614497deae72c64e39718':

commit | commitdiff | tree

Ji Yang [Thu, 27 Aug 2015 09:29:23 +0000 (09:29 +0000)]

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

* commit 'ba29aaf21969aafa4211d9d077bc44dad837d20b':

commit | commitdiff | tree

Dan Sandler [Thu, 27 Aug 2015 09:29:10 +0000 (09:29 +0000)]

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

* commit 'b4c12fdb522501b86d45ab0c49ebb86bd5d23076':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 09:28:48 +0000 (09:28 +0000)]

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

* commit 'b4a5f7d9138523cd044c0243a1790156f818a540':

commit | commitdiff | tree

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

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

* commit '6f73eb0c0869f27693f2cde0c8e8f681ae3e05d2':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 09:27:42 +0000 (09:27 +0000)]

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

* commit '7840685465f988e9a8afc113298096fe9481e87e':

commit | commitdiff | tree

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

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

* commit '7a763bc1552da5ddf1944ddf8946d0292110ce55':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 09:27:11 +0000 (09:27 +0000)]

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

* commit 'bbe80810ab76301fa7a2502f60a20ad3c9b9253d':

commit | commitdiff | tree

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

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

* commit '0322ccf69a40786550ccb75f81881f2915906f17':

commit | commitdiff | tree

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

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

* commit '401de11f16274df1dd248f4697cd159ccfca37c9':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:26:46 +0000 (09:26 +0000)]

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

* commit '4854d113cee165cdc63a4f0b0e1d7b5f91cd55ce':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 09:26:39 +0000 (09:26 +0000)]

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

* commit '9c5a06aa9cd18e844e07760696264b86f13332d7':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 09:26:31 +0000 (09:26 +0000)]

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

* commit 'c4887d0f4e66ca4e98dd619b3aa44ef4d768794e':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 09:26:23 +0000 (09:26 +0000)]

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

* commit 'd26bc1c0b4839d5e3bba01c2487194033dc8341a':

commit | commitdiff | tree

Maurice Lam [Thu, 27 Aug 2015 09:26:12 +0000 (09:26 +0000)]

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

* commit '7ce565f39b6865da739232f0a3f753a5fd6ec82c':

commit | commitdiff | tree

Christine Hallstrom [Thu, 27 Aug 2015 09:25:55 +0000 (09:25 +0000)]

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

* commit '584d61211f428575f4746c3ee2f66a6f8a5807af':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 09:25:31 +0000 (09:25 +0000)]

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

* commit '62e2b84ce84144ab1b6855560f403058a9324abd':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:25:05 +0000 (09:25 +0000)]

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

* commit '862dc4f2c9053c29e85d7ef4a625bcc09c7aa57f':

commit | commitdiff | tree

Sailesh Nepal [Thu, 27 Aug 2015 09:24:47 +0000 (09:24 +0000)]

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

* commit '04a69aa102be7ae4f31bf8a990f4f8ef9ea6f230':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:24:35 +0000 (09:24 +0000)]

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

* commit '7b09e2c054a8ef3165d130d8ef97b92bcd213764':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 09:24:23 +0000 (09:24 +0000)]

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

* commit '986812a6a25d159b7fbe5af9daf9d5e7dcda35d4':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:24:14 +0000 (09:24 +0000)]

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

* commit 'c2a024392ac7564126c0e09ee77e529fd1c37365':

commit | commitdiff | tree

Nicolas Prévot [Thu, 27 Aug 2015 09:24:05 +0000 (09:24 +0000)]

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

* commit '91775db6b5154b3771ffcb4bfee84bfc3b884296':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 09:23:58 +0000 (09:23 +0000)]

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

* commit '49d7d4810943a67519b02f53299e6836070aa9b6':

commit | commitdiff | tree

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

am 2eeb47c6: (-s ours) am 1bd310e1: Merge "import more metrics enums" into mnc-dev

* commit '2eeb47c6a15141dc78bef94fc6f173d833f58143':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 09:23:27 +0000 (09:23 +0000)]

am 1ed96576: (-s ours) am 30813942: Merge "Disable WiFi autojoin when user decides via "Stay connected?" dialog" into mnc-dev

* commit '1ed96576a8a2faaafb3c677081efd53512dac551':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 09:22:57 +0000 (09:22 +0000)]

am f1fce87a: (-s ours) am 7157c2ca: Merge "Revert "Call getInstanceForPackage instead of creating a new SensorManager instance."" into mnc-dev

* commit 'f1fce87a2859093df25a139b99d0ed3369ea8b20':

commit | commitdiff | tree

Martijn Coenen [Thu, 27 Aug 2015 09:22:23 +0000 (09:22 +0000)]

am 966e276f: (-s ours) am 50184147: Merge "Resource for setting default NFC payment component." into mnc-dev

* commit '966e276fc4fd1a000ae6accb058d416e43bde4bc':

commit | commitdiff | tree

Shawn Willden [Thu, 27 Aug 2015 09:21:50 +0000 (09:21 +0000)]

am 48951e4a: (-s ours) am a7b4d6dc: Merge "Keymaster digest/padding NONE no longer means ANY." into mnc-dev

* commit '48951e4a80dfa576993b5fd1d9c8e13608b3e6a4':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:21:12 +0000 (09:21 +0000)]

am 667f35fa: (-s ours) am b8040265: Merge "Give secondary users read-only physical cards." into mnc-dev

* commit '667f35fab8ee5d06e4a28421d05b01ffff0fbb4a':

commit | commitdiff | tree

Ronghua Wu [Thu, 27 Aug 2015 09:20:50 +0000 (09:20 +0000)]

am da0b2ce3: (-s ours) am 02022b70: Merge "media: fix estimateFrameRatesFor to use correct ratio" into mnc-dev

* commit 'da0b2ce39ccc0eb2042cf601ff89883f67b4fa10':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:20:37 +0000 (09:20 +0000)]

am 37cf391c: (-s ours) am b310c894: Merge "Fix issue #22802691: APR: NPE in ActivityRecord" into mnc-dev

* commit '37cf391caf35ed0424378a20ed674240ea8528aa':

commit | commitdiff | tree

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

am cf887f5c: (-s ours) am 5b009d52: Merge "Fix issue #22802617: APR: spurious wtf when restarting a persistent process" into mnc-dev

* commit 'cf887f5c91964ff939b5bcc635b3aeff88b796ed':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:20:06 +0000 (09:20 +0000)]

am 9d3a0efa: (-s ours) am b492ced8: Merge "Fix issue #22802782: APR: NPE in package manager with bad intent data" into mnc-dev

* commit '9d3a0efaef4dd33fac81ddcff88d9bdc467e463d':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:19:39 +0000 (09:19 +0000)]

am 9466fa27: (-s ours) am c96e6f19: Merge "BatteryStats: Use proper power calculator when energy data is received" into mnc-dev

* commit '9466fa27b1dc46376ebde62a300954bd88a198d7':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 09:19:07 +0000 (09:19 +0000)]

am 139dabcc: (-s ours) am fbcbad13: Merge "Add sizes to SysUI tests" into mnc-dev

* commit '139dabcc427856692698ca489ec43cffc7a99252':

commit | commitdiff | tree

Aravind Akella [Thu, 27 Aug 2015 09:18:30 +0000 (09:18 +0000)]

am 4633f371: (-s ours) am 15938235: Merge "Call getInstanceForPackage instead of creating a new SensorManager instance." into mnc-dev

* commit '4633f37107980378b1583b22437a31168cf359e8':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:17:57 +0000 (09:17 +0000)]

am 66c3fc38: (-s ours) am 0d210f63: Animation for touch, wake and unlock

* commit '66c3fc38545923152a8bb04e8a73418205cec21d':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 09:17:29 +0000 (09:17 +0000)]

am 36d5edff: (-s ours) am 751a96a0: Merge "Don\'t redundantly call transport.finishRestore()" into mnc-dev

* commit '36d5edff87b7a222575b5b8b93fe4244618708df':

commit | commitdiff | tree

Zach Johnson [Thu, 27 Aug 2015 09:17:04 +0000 (09:17 +0000)]

am 6b026e31: (-s ours) am 5faa0336: Merge "Add filter for personal apps that are not disabled until first use" into mnc-dev

* commit '6b026e31730355948e175b88d14c5bbf1d2b8634':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 09:16:37 +0000 (09:16 +0000)]

am beef2b78: (-s ours) am f2c616ed: Merge "Partially revert package freezing" into mnc-dev

* commit 'beef2b78ada95582552ed194fcc57e633b6afec6':

commit | commitdiff | tree

Tyler Gunn [Thu, 27 Aug 2015 09:16:11 +0000 (09:16 +0000)]

am 11f2dbf7: (-s ours) am bdbec480: Merge "Add "Call subject" capability to phone accounts." into mnc-dev

* commit '11f2dbf7efbb56b737b9332ebead6a24a73c7078':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 09:15:38 +0000 (09:15 +0000)]

am 8b679bfa: (-s ours) am 3551a59b: Merge "Work on issue #21516866: Implement voice interaction in ResolverActivity" into mnc-dev

* commit '8b679bfa3691d71c4ee70e23fc06edc5a3799483':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:15:11 +0000 (09:15 +0000)]

am 69aa584f: (-s ours) am 850dd690: Merge "Don\'t use screenshot if structure is disabled (1/2)" into mnc-dev

* commit '69aa584f4e3d688fc8a9c8c39855cda5e7895355':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 09:14:53 +0000 (09:14 +0000)]

am 1bf3bec7: (-s ours) am b3c93c5f: Merge "Un-remove legacy ConnectivityManager API." into mnc-dev

* commit '1bf3bec726f6d84ffc6035d08ea3d6eeead6a9f7':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 09:14:38 +0000 (09:14 +0000)]

am e6e2c108: (-s ours) am 35066219: Merge "Fix network name not showing in QS sometimes" into mnc-dev

* commit 'e6e2c10860f0e274a73bd7bd16dd905e1ff40ec3':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:14:23 +0000 (09:14 +0000)]

am 88b65478: (-s ours) am 60261137: Merge "BatteryStats: Compensate for accuracy issues when reporting WiFi energy data issues with Slog.wtf" into mnc-dev

* commit '88b654789811a62c5ecd0966ba9d19ebc169e97d':

commit | commitdiff | tree

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

am 8f4787e6: (-s ours) am e288b3af: Merge changes I5c994de5,I6cb0dd84 into mnc-dev

* commit '8f4787e615c483081c7c4844b0f81c0e0d8dfca8':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:13:58 +0000 (09:13 +0000)]

am ad780f33: (-s ours) am 965bab2b: Merge "Allow assist gesture when notification shade is expanded" into mnc-dev

* commit 'ad780f3330dcf6330dbe3ff695e4ff3ae2f4d889':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 09:13:46 +0000 (09:13 +0000)]

am 506424fc: (-s ours) am beb6e668: Merge "Allow text selection handles to scroll horizontally" into mnc-dev

* commit '506424fc9942c7e6baea4c9c79f6579717ebbbc6':

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Aug 2015 09:13:33 +0000 (09:13 +0000)]

am ba140949: (-s ours) am ee2a16b5: Merge "Update DngCreator to correctly handle array sizes." into mnc-dev

* commit 'ba140949ad27642a7e94c82511508d740fa1fa11':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:13:15 +0000 (09:13 +0000)]

am 33d4bd4a: (-s ours) am fd44b56d: Merge "AAPT: Fix printing of resource configurations" into mnc-dev

* commit '33d4bd4a9b42972fee3fc84a8babcef1030b72c1':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 09:12:53 +0000 (09:12 +0000)]

am 089f65ed: (-s ours) am f63800dd: Merge "Remove unnecessary relayout call from traversals." into mnc-dev

* commit '089f65ed1e635b96f341562c78e86e43f20211a5':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 09:12:30 +0000 (09:12 +0000)]

am cb3ae68e: (-s ours) am 67a32c49: Merge "Added missing check for MANAGE_USERS" into mnc-dev

* commit 'cb3ae68e145ab33df2502e0cc321566cf4ae8aaf':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 09:12:13 +0000 (09:12 +0000)]

am 199c0b3f: (-s ours) am e827c252: Merge "Allow soft hyphens in languages without patterns" into mnc-dev

* commit '199c0b3f0e03d109d4769d7e01e155b26d946d7c':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:11:58 +0000 (09:11 +0000)]

am 759fe1ec: (-s ours) am 2e606d7b: Enforce DISALLOW_MOUNT_PHYSICAL_MEDIA.

* commit '759fe1ec66a6c7b23e2556fca2e98f3ffb2a0a55':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 09:11:44 +0000 (09:11 +0000)]

am 07be576d: (-s ours) am 71bfb270: Merge "Added the content description for the fingerprint icon" into mnc-dev

* commit '07be576dec17a2e7f0b4507dd20e10fd268ef649':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:11:31 +0000 (09:11 +0000)]

am 97bb9d05: (-s ours) am fc28d6fc: Merge "BatteryStats: Prevent BatteryService from blocking" into mnc-dev

* commit '97bb9d0546e8672e0467c838c4c374e86e071d09':

commit | commitdiff | tree

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

am c150c328: (-s ours) am f68e0236: Merge "Allow Settings to set background data restrict on secondary users." into mnc-dev

* commit 'c150c328de1b8c132079f63aa1cc79279cb0c859':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 09:11:06 +0000 (09:11 +0000)]

am 0483d720: (-s ours) am 4ba1820b: Revert "am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs""

* commit '0483d7208b4eee662050ba80e4523cdfbd922178':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 09:10:53 +0000 (09:10 +0000)]

am 515e444f: (-s ours) am 66179430: Merge "Fix QS switch accessibility problem" into mnc-dev

* commit '515e444fdb24bbb414d4ab55407b8ed803dd0578':

commit | commitdiff | tree

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

am 817ea6d4: (-s ours) am 8a54da92: Merge "Pass correct extras to the custom print options activity" into mnc-dev

* commit '817ea6d48d25540a6267cc58411bd6581a15778f':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:10:09 +0000 (09:10 +0000)]

am d315926a: (-s ours) am 9e49b5d6: Merge "Move PIN/Pattern appear animation to RenderThread (1/2)" into mnc-dev

* commit 'd315926aecc36f86406bb2fefcb8742cd7238d91':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 09:09:45 +0000 (09:09 +0000)]

am ab173ca6: (-s ours) am 01fe3f86: am 1c964bec: Revert "am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs"

* commit 'ab173ca630c8da856dedc06d4450fcc5e4b8c739':

commit | commitdiff | tree

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

am bd193f38: (-s ours) am b83b5fa6: Merge "Check for ACCESS_COARSE_LOCATION/ACCESS_FINE_LOCATION" into mnc-dev

* commit 'bd193f38f7f9cb62248dad8aca3808468c96ecaa':

commit | commitdiff | tree

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

am 71fb7e59: (-s ours) am 4604c1dc: Merge "Fix bitmap get/set pixels for ALPHA_8" into mnc-dev

* commit '71fb7e5927a6f90bf18da7e8c040be529c167688':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 09:08:55 +0000 (09:08 +0000)]

am a37a1b00: (-s ours) am fef1b289: Merge "MIDI: fix running status parser" into mnc-dev

* commit 'a37a1b006e4485a04befdc51945b7ca5d249f29b':

commit | commitdiff | tree

Tim Volodine [Thu, 27 Aug 2015 09:08:47 +0000 (09:08 +0000)]

am 6c1e0991: (-s ours) am 91b31b53: Merge "Revert "Invoke geolocation permissions callback with denied state by default."" into mnc-dev

* commit '6c1e0991464e492770514608227d5c9b7eb1b0ac':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 09:08:38 +0000 (09:08 +0000)]

am 2d574990: (-s ours) am 9c450936: am c571a9a1: am 6397ae6a: Merge "Update data binding for RC1." into mnc-preview-docs

* commit '2d574990afccde49e7251565929df7841b08eb79':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 09:08:30 +0000 (09:08 +0000)]

am c22b89ad: (-s ours) am c0231f26: (-s ours) am a29cfefe: (-s ours) am 95e6ae3a: (-s ours) Merge "DO NOT MERGE ANYWHERE. Add data binding to built javadoc." into mnc-preview-docs

* commit 'c22b89ad1cda0f3e02865bdbb48ee9dddee26122':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 09:08:23 +0000 (09:08 +0000)]

am 229b49c3: (-s ours) am 11f4cb1b: Merge "decide interruptions based on current data, not previous data." into mnc-dev

* commit '229b49c39b0b9d4c07750d316856209fb4f2fb65':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 09:08:14 +0000 (09:08 +0000)]

am aaa23354: (-s ours) am 45a0bb18: Merge "add ticker to enqueue message for easier debugging" into mnc-dev

* commit 'aaa233547668d2c9225a7369dbd2bfb4f0cd8f32':

commit | commitdiff | tree

Erik Kline [Thu, 27 Aug 2015 09:08:03 +0000 (09:08 +0000)]

am 229e4d9a: (-s ours) am a7bdace2: Merge "Change to connectivitycheck.gstatic.com" into mnc-dev

* commit '229e4d9ae4c3757d7ee90074bb63ab0e984d1752':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 09:07:47 +0000 (09:07 +0000)]

am faf11661: (-s ours) am 73612fbb: am e942b459: Merge "ActivityManagerService: delete unnecessary mkdir"

* commit 'faf11661f07b18808674e60d2245337685982e3d':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 09:07:24 +0000 (09:07 +0000)]

am fdda1ec3: (-s ours) am 8be305dd: Merge "Also check app-ops on path-permissions." into mnc-dev

* commit 'fdda1ec30b98b983bab08a97f0eb63d05e06d904':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 09:07:02 +0000 (09:07 +0000)]

am fe8310b7: (-s ours) am d9f1a0c3: Merge "Fixed wake to unlock when the device has never been unlocked" into mnc-dev

* commit 'fe8310b72efc22b806e28bd3cc11fd90e93dc8fb':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 09:06:47 +0000 (09:06 +0000)]

am c6ab2d3d: (-s ours) am f3255489: Fix ambient display

* commit 'c6ab2d3d5bd8ef83d9ddaeb38a6245e2e69ef5b5':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 09:06:32 +0000 (09:06 +0000)]

am 9736d0cc: (-s ours) am 2a493532: Merge "BatteryStats: Decode wakeup reasons in Java" into mnc-dev

* commit '9736d0ccaa741b2523163ac7906d873c25330ec0':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 09:06:20 +0000 (09:06 +0000)]

am d475549f: (-s ours) am f8acd1d8: Merge "Adapted the behavior when unlocking with fingerprint is not allowed" into mnc-dev

* commit 'd475549f4079c2bd08e98266a10290f2d277718f':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 09:06:12 +0000 (09:06 +0000)]

am 44959639: (-s ours) am ac2c632f: am c0999f78: Merge "Frameworks/base: Hand fingerprint to ART"

* commit '4495963910bbb2ddb55f148efd9ab181475927ad':

commit | commitdiff | tree

Chris Banes [Thu, 27 Aug 2015 09:06:04 +0000 (09:06 +0000)]

am a8c721a4: (-s ours) am c174de0a: am 5442932a: am 7b099152: Merge "v22.2.1 support api diff" into mnc-preview-docs

* commit 'a8c721a4f2c844f87bc9b0ece25e6c7570966285':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 09:05:55 +0000 (09:05 +0000)]

am ba43413d: (-s ours) am 384b5d20: am a65de4fd: am b2f8c716: am 50ed152a: am 7f63ef38: am 9b6a6099: Prevent insanely long passwords from crashing SystemUI

* commit 'ba43413df15bcf0ed41b6ef837cb3e80e6df363b':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 09:05:46 +0000 (09:05 +0000)]

am a531ddca: (-s ours) am 68fbd6a4: Merge "Use process state to filter >= UI_HIDDEN" into mnc-dev

* commit 'a531ddcad9a02c657d36081a397e17c19f10bf1c':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 09:05:29 +0000 (09:05 +0000)]

am 29793dd4: (-s ours) am 4629f1c5: Merge "Fix janky add guest transition" into mnc-dev

* commit '29793dd4ad199698735adaf4fec321fe13d5278e':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 09:05:03 +0000 (09:05 +0000)]

am 7d33ecc1: (-s ours) am 9a755e36: Merge "Frameworks/base: Hand fingerprint to ART" into mnc-dev

* commit '7d33ecc147f0476fbe9c229faf06becabfb3e8fe':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 09:04:28 +0000 (09:04 +0000)]

am 59ddd576: (-s ours) am f0bead28: Merge "DO NOT MERGE Enhance local log." into mnc-dev

* commit '59ddd576ebe60ebc5d5514fc515ea3523ac4dbea':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 09:03:44 +0000 (09:03 +0000)]

am 69259b13: (-s ours) am 2c5aeeaa: Merge "Require permission for internal broadcast" into mnc-dev

* commit '69259b13fd750cd0666880fe27cb9400307ca09a':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 09:03:04 +0000 (09:03 +0000)]

am 5ddefc17: (-s ours) am a5e25f33: Merge "Added ACCESS_COARSE_LOCATION permission for BT" into mnc-dev

* commit '5ddefc174cd58487dfd7079b0f4c39bf19db4ae4':

commit | commitdiff | tree

Andrei Stingaceanu [Thu, 27 Aug 2015 09:02:40 +0000 (09:02 +0000)]

am da905717: (-s ours) am 45794910: Merge "Disallow dragging text in extracted mode" into mnc-dev

* commit 'da90571750c15da557c9f807fe86f9a09ce9e473':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 09:02:26 +0000 (09:02 +0000)]

am 71a7651a: (-s ours) am ea00f320: Merge "Prevent lockscreen album art from flickering on metadata change." into mnc-dev

* commit '71a7651abd4d6408480817088b579f9114aa6e5c':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 09:02:10 +0000 (09:02 +0000)]

am a8bc790a: (-s ours) am abd35bfc: Merge "Add FEATURE_FINGERPRINT to PackageManager\'s feature list" into mnc-dev

* commit 'a8bc790a60a23ce281d59d8f3d34f6fde70c8242':

commit | commitdiff | tree

Ying Wang [Thu, 27 Aug 2015 09:01:53 +0000 (09:01 +0000)]

am 25e10e35: (-s ours) am 802da28f: am 430c8c3e: Merge "Add phony source target in the generated dependency file of aidl."

* commit '25e10e353d3532cf6780145b6b4979f6b3855c09':

commit | commitdiff | tree

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

am e14a2f33: (-s ours) am 7b996853: Merge "MediaPlayer subtitle controller: use debug log instead of warning" into mnc-dev

* commit 'e14a2f3355328f13d12b70e372120022bba9df9f':

commit | commitdiff | tree

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

am 549dfccc: (-s ours) am 6b66a4a8: use findProcess instead of getProcess

* commit '549dfccc35ebf4b27eac9419eb451c6040c97bf2':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 09:00:11 +0000 (09:00 +0000)]

am 83c7c06d: (-s ours) am eea9892d: Merge "UICC : discard language setting of SIM" into mnc-dev

* commit '83c7c06d05176390033290d1f7a07a4064239fd2':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 08:59:23 +0000 (08:59 +0000)]

am 30a03425: (-s ours) am 0063e0bc: Merge "Disable Keyguard affordances before setup is completed" into mnc-dev

* commit '30a03425b256a466da5c3d364b157f9af509f3dc':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 08:58:44 +0000 (08:58 +0000)]

am 056b71c0: (-s ours) am 28762e61: Merge "Keep default permission grants uninstalling a sys package upgrade" into mnc-dev

* commit '056b71c05fd92cb0b323a0b185ca74487b03aabb':