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

Christopher Tate [Thu, 27 Aug 2015 07:26:44 +0000 (07:26 +0000)]

am 970cdd9b: (-s ours) am 288ecf98: Merge "Prioritize most-recently-enabled link-handling app" into mnc-dev

* commit '970cdd9ba4f09fddb9eaffd3ce89a105842da701':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 07:26:26 +0000 (07:26 +0000)]

am 247c9236: (-s ours) am 56c59d15: Merge "Fix two grant default permissions edge cases." into mnc-dev

* commit '247c9236b32eda904736e454bc600fd2c8fa021b':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 07:26:09 +0000 (07:26 +0000)]

am 6bf45231: (-s ours) am 9de5dcac: am 70d39c28: am 2b856100: Merge "docs: Removed references to lockscreen widgets, added note to Android 5.0 changes page" into mnc-preview-docs

* commit '6bf45231dd0dfb09c5d890c026980b41c1dbc462':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 07:25:50 +0000 (07:25 +0000)]

am ab64eff5: (-s ours) am 9c2182e1: Merge "Add a dumpsys for KeyguardUpdateMonitor" into mnc-dev

* commit 'ab64eff59f0ec705049936574e07385d3835041f':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 07:25:27 +0000 (07:25 +0000)]

am ed0c4ddc: (-s ours) am fd186d20: am 28006a3b: am 7182f075: Merge "docs: Changed text as requested in Android TV advertising bug, with minor cleanup" into mnc-preview-docs

* commit 'ed0c4ddcf863cc1307d548e1a2798bfcb00d9d1e':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 07:25:08 +0000 (07:25 +0000)]

am 323dd6c9: (-s ours) am 0b403ebd: am 1962b730: am 3430bec7: Merge "docs: Removed parenthetic phrase that made explanation unnecessarily confusing" into mnc-preview-docs

* commit '323dd6c9b47dd5c8dfaf843b450268dbe2e55ea9':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 07:24:49 +0000 (07:24 +0000)]

am 69a936e0: (-s ours) am 91a44578: am 5c3bf584: am e0f0fabb: am ccb8a9af: am b510225e: Merge "docs: replacing command line tool instructions with Studio and Monitor steps" into lmp-docs

* commit '69a936e0b21fe93b08f699d5a81ac09c4457a02e':

commit | commitdiff | tree

Eric Gilmore [Thu, 27 Aug 2015 07:24:33 +0000 (07:24 +0000)]

am f376b4cf: (-s ours) am 908c50a1: am f13e914d: am 8cce3984: Merge "Adding a link to what is currently our most popular "100 Days" video." into mnc-preview-docs

* commit 'f376b4cfff90643a27fb68ca398beabc18d6b85c':

commit | commitdiff | tree

Jinsuk Kim [Thu, 27 Aug 2015 07:24:19 +0000 (07:24 +0000)]

am 23223026: (-s ours) am e249eb3a: Merge "Perform One touch play upon pressing home key" into mnc-dev

* commit '23223026d897f17713ceae9a4d39a257219ffb1d':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 07:24:03 +0000 (07:24 +0000)]

am 639ebe0c: (-s ours) am cf01fd0f: Merge "Catch & log security exception in telephonymanager" into mnc-dev

* commit '639ebe0c159bd09dd7e84ba40ccf6f8626632dd5':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 07:23:41 +0000 (07:23 +0000)]

am 8eeb2e9b: (-s ours) am 53e5ba22: Merge "Do not check runtime READ_PHONE_STATE if caller has the privileged one." into mnc-dev

* commit '8eeb2e9bd90e6f2774bd12424a99ce83e4551fff':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 07:23:08 +0000 (07:23 +0000)]

am 0aaea6d3: (-s ours) am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev

* commit '0aaea6d37060cd04f724a60f7df6af2b5465ba85':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 07:22:28 +0000 (07:22 +0000)]

am afa4766d: (-s ours) am 093d8de2: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'afa4766d25ff4495bbcd615a7dcf17787cec5a94':

commit | commitdiff | tree

Vinit Deshpande [Thu, 27 Aug 2015 07:22:10 +0000 (07:22 +0000)]

am 4b0d92ca: (-s ours) am 0bd08fc2: Merge "Fix multiple SSIDs for same Passpoint issues" into mnc-dev

* commit '4b0d92ca3a43ea8a03152e38f2ded713713897e4':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 07:22:01 +0000 (07:22 +0000)]

am 23e65930: (-s ours) am 16c1764c: Merge "Change MANAGE_FINGERPRINT permission to system|signature" into mnc-dev

* commit '23e65930acc630266378f956d70d3ec6d56e6c26':

commit | commitdiff | tree

Aravind Akella [Thu, 27 Aug 2015 07:21:53 +0000 (07:21 +0000)]

am 4bbc3edd: (-s ours) am 37511e35: Merge "Log full class name of the client activating sensors for better debugging." into mnc-dev

* commit '4bbc3edd29e1c7471c0efbc670aa374941f118bd':

commit | commitdiff | tree

Etan Cohen [Thu, 27 Aug 2015 07:21:45 +0000 (07:21 +0000)]

am 66d9e138: (-s ours) am c09544bb: Merge "Fix filter on CONNECTIVITY_ACTION updates" into mnc-dev

* commit '66d9e138fa19cf57f9a6a7c4e1ff867d0a600f58':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 07:21:36 +0000 (07:21 +0000)]

am f6335156: (-s ours) am 1578357d: Merge "Check user state after clearing identity." into mnc-dev

* commit 'f633515699a3f283fea87a39ea7d718d908f8120':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 07:21:28 +0000 (07:21 +0000)]

am 70811001: (-s ours) am 208934ff: Merge "fix build by restoring deleted enum" into mnc-dev

* commit '70811001a372766c7a54d8daec2b428706b4f253':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 07:21:13 +0000 (07:21 +0000)]

am 11ece5ce: (-s ours) am fbd0a444: Merge "Remove personal/device group from sideloading screen." into mnc-dev

* commit '11ece5ceec31e052672be46fd7a5433a0ae15158':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 07:20:49 +0000 (07:20 +0000)]

am a8d5740c: (-s ours) am 28a07ff0: Merge "Fix demo mode issues" into mnc-dev

* commit 'a8d5740c83746e3843af0faba755d1ff56b1520a':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 07:20:15 +0000 (07:20 +0000)]

am 83e5a72b: (-s ours) am 4502bfb8: Merge "add new enums to MetricsConstans" into mnc-dev

* commit '83e5a72b672d9c9787ec0fcb42335004313e7d36':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 07:20:01 +0000 (07:20 +0000)]

am b1d0e8ac: (-s ours) am 59b1dfef: Merge "Show volume restriction toast on all users" into mnc-dev

* commit 'b1d0e8acab59567b2fe409c12b8f0d94ac79f184':

commit | commitdiff | tree

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

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

* commit '876e7c175bca24954a4ad01fb9816b56d01a37b6':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 07:19:41 +0000 (07:19 +0000)]

am f6db67c8: (-s ours) am 3ecbca50: am 886630c0: Merge "Switch shutdownInput / shutdownOutput to using Os.shutdown."

* commit 'f6db67c8f3fd0c57944a51289b5ef63c4f746f8a':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 07:19:32 +0000 (07:19 +0000)]

am 87ea7e2f: (-s ours) am cf9aebf1: Merge "Remove ExternalStorageFormatter" into mnc-dev

* commit '87ea7e2fb6b81a53664a404be52d03025705f7e2':

commit | commitdiff | tree

Esteban Talavera [Thu, 27 Aug 2015 07:19:24 +0000 (07:19 +0000)]

am 82bd3ae0: (-s ours) am 0ec43f89: Merge "Use correct user when filtering app link candidates" into mnc-dev

* commit '82bd3ae008dd0e1313381deffece01c31ce92110':

commit | commitdiff | tree

Esteban Talavera [Thu, 27 Aug 2015 07:19:12 +0000 (07:19 +0000)]

am 81d511ab: (-s ours) am 22921603: Merge "Don\'t send app links to parent profile if status == never" into mnc-dev

* commit '81d511abe0bf352e5bcb8fe7f946a70b51000fe5':

commit | commitdiff | tree

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

am 462ab255: (-s ours) am 96d00ab3: Merge "Bug: 21589105 Rescope WRITE_SETTINGS and SYSTEM_ALERT_WINDOW permission" into mnc-dev

* commit '462ab2555e4eb4a8034e166e2c89d06cd1102af4':

commit | commitdiff | tree

Zhijun He [Thu, 27 Aug 2015 07:18:04 +0000 (07:18 +0000)]

am 6fe81428: (-s ours) am 4fb81253: Camera metadata: fix typos.

* commit '6fe81428df10fe792b792cd56219ca1f9d3be6d7':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 07:17:12 +0000 (07:17 +0000)]

am 15a7ef90: (-s ours) am 1962ad3e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '15a7ef90d6110e5891573c86a4c0c7eb17157a02':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 07:16:22 +0000 (07:16 +0000)]

am 6c9fd7ad: (-s ours) am d64ba82e: (-s ours) Import translations. DO NOT MERGE

* commit '6c9fd7ad1276fce19d189519940fc917ae452878':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 07:15:39 +0000 (07:15 +0000)]

am 4a4a4505: (-s ours) am 1b3d0351: Merge "Improve Html.toHtml() documentation" into mnc-dev

* commit '4a4a4505d5287940a5a9dc64711bc6da7596bdba':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 07:15:04 +0000 (07:15 +0000)]

am c8e4f119: (-s ours) am 292eb65f: Merge "Fix new user creation regression due to vold remount calls" into mnc-dev

* commit 'c8e4f119759b59ec17f9a35b95ce9086772f5db6':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 07:14:11 +0000 (07:14 +0000)]

am 724d13b2: (-s ours) am 5449ee07: Merge "Avoid IPC call with an empty array" into mnc-dev

* commit '724d13b28801a84f6856062c4d97394ef16a0799':

commit | commitdiff | tree

Sanket Padawe [Thu, 27 Aug 2015 07:13:14 +0000 (07:13 +0000)]

am 51705fab: (-s ours) am 233bd3ce: Merge "Changes security for Passpoint to EAP security from "Passpoint"." into mnc-dev

* commit '51705faba5f5a352000070bd2e2081d37f26b5f7':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 07:12:31 +0000 (07:12 +0000)]

am 730e223d: (-s ours) am d374c20f: Merge "Fix flash of uninitialized surface" into mnc-dev

* commit '730e223d3742225c829e578ff34c18c5912b7a86':

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 07:12:06 +0000 (07:12 +0000)]

am d4d60217: (-s ours) am 97cf0f1d: Merge "Revert "Revert "Security: AccountChooser shouldn\'t auto reveal accounts.""" into mnc-dev

* commit 'd4d6021785c898b9c0b6421d2a1ddf0c95c7f8a3':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 07:11:17 +0000 (07:11 +0000)]

am b5d3e0cc: (-s ours) am 1c277ca8: Merge "Fix: line slop shouldn\'t always increase / decrease by one line" into mnc-dev

* commit 'b5d3e0cc10530362d144216fe7507e82640b5340':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 07:10:25 +0000 (07:10 +0000)]

am b0fd6bf0: (-s ours) am a9f07ccf: Merge "Fix line slop issue at end of line for Thai & CJK" into mnc-dev

* commit 'b0fd6bf0d98a87af5dfb7def76c32b5d938dd247':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 07:09:41 +0000 (07:09 +0000)]

am 68ba2310: (-s ours) am 26b0f1e4: Merge "Revert "Finish already paused activity if it should be finished after pausing"" into mnc-dev

* commit '68ba23105b9527db3dccb90faa1ec048063b4054':

commit | commitdiff | tree

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

am 523be5f8: (-s ours) am 8657d9e8: Merge "JNI optimization tweaks to Paint high-frequency methods" into mnc-dev

* commit '523be5f83280dbd90cec28d7c2674e7b341caf64':

commit | commitdiff | tree

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

am 0fa464e7: (-s ours) am 9f004920: Merge "Reduce cost of span type checking" into mnc-dev

* commit '0fa464e7f5ca410035c8bf22281f1db588acf738':

commit | commitdiff | tree

Robin Lee [Thu, 27 Aug 2015 07:08:47 +0000 (07:08 +0000)]

am 720252a9: (-s ours) am 6795a2ae: Check legacy VPN is connected before alerting

* commit '720252a94814dbf48c422ac55babaa0b5596c67a':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 07:08:20 +0000 (07:08 +0000)]

am 7ea86aa8: (-s ours) am 0c758805: Merge "Fix empty keyguard for once and all" into mnc-dev

* commit '7ea86aa87c0dbd25d409ba7f12ddff8e00591ee3':

commit | commitdiff | tree

Jinsuk Kim [Thu, 27 Aug 2015 07:07:43 +0000 (07:07 +0000)]

am a8367bc8: (-s ours) am 256642aa: Merge "CEC: Do not switch language if the new one is same as the old one" into mnc-dev

* commit 'a8367bc85a0145d650bd417f7fc62164578770c0':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 07:07:08 +0000 (07:07 +0000)]

am 1bd6d9c9: (-s ours) am 94fed352: am 188af044: Merge "Revert "frameworks/base: libexpat now exports its headers.""

* commit '1bd6d9c979eddeaa8fb602383fa227db8e741ef9':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 07:06:44 +0000 (07:06 +0000)]

am aa4a994d: (-s ours) am 4d4c4507: am 220b61f1: Merge "frameworks/base: libexpat now exports its headers."

* commit 'aa4a994d5c6e136752b41964d655ff610b345cd0':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 07:06:28 +0000 (07:06 +0000)]

am 33bbc0ed: (-s ours) am c1541571: am 1c231da0: am 48143e6a: Docs: Fixes to Preview "Program Overview" page; rewording on "Support" page

* commit '33bbc0ed6a4fe5a5df40e5c528c1c479aa89655d':

commit | commitdiff | tree

Robin Lee [Thu, 27 Aug 2015 07:06:11 +0000 (07:06 +0000)]

am dcc4b259: (-s ours) am f180fe31: Merge "Legacy VPN calls to require a userID" into mnc-dev

* commit 'dcc4b2597fe61b5745d47dafd8b68fee7b1fa576':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 07:05:52 +0000 (07:05 +0000)]

am 3991abf9: (-s ours) am 5d1654a9: Merge "Fix StaticLayout crash when maxLines = 0" into mnc-dev

* commit '3991abf987bff5519f7f2de478fc1a4d918546b0':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 07:05:20 +0000 (07:05 +0000)]

am 313e8adf: (-s ours) am 1570b6b3: Merge "Enable EMERGENCY mobile connections." into mnc-dev

* commit '313e8adfd04399263576711712649e6fdd3a9fe5':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 07:04:47 +0000 (07:04 +0000)]

am 49a60bb3: (-s ours) am 1ebcb6f8: Merge "Fix permissions." into mnc-dev

* commit '49a60bb31099ee0f95bda67707beede3faa78c0a':

commit | commitdiff | tree

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

am f604d486: (-s ours) am 77cae786: am 98b1f102: am c2b0d1d4: Merge "Support Library v22.2.0 API diff" into mnc-preview-docs

* commit 'f604d4866f2ea8bceccfc5465631f6acd97eb981':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 07:04:19 +0000 (07:04 +0000)]

am d179ca49: (-s ours) am 2c7ed6e8: Merge "Improve ImageView drawable re-use" into mnc-dev

* commit 'd179ca49ea83c36886b0822c2a6e997477dd81ee':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 07:04:09 +0000 (07:04 +0000)]

am 8e83b783: (-s ours) am 525ac80d: Merge "Create a thread_local cache for textLocale" into mnc-dev

* commit '8e83b783fab5c257b0577a0bd4396be2f4e2779c':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 07:04:01 +0000 (07:04 +0000)]

am 8e41f1f3: (-s ours) am a2c2cc42: am 3f831568: am 6fb22b4e: Docs: Revisions to top DAC landing page and several Preview-page revisions.

* commit '8e41f1f338690dcfca8a15047205694828dd3133':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 07:03:53 +0000 (07:03 +0000)]

am 7818bd37: (-s ours) am 1cb0de17: Merge "Correct the comparison done in removeAdapter." into mnc-dev

* commit '7818bd37e9f81e365dccfe82005844c7a7f329e2':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 07:03:45 +0000 (07:03 +0000)]

am 78dc04d8: (-s ours) am 3b9ce37b: Fix build break.

* commit '78dc04d81b785a8da184f3977b5642763ce35ea9':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 07:03:36 +0000 (07:03 +0000)]

am 48090be8: (-s ours) am bbce221e: Merge "Fallback to Cellular if WiFi fails to validate" into mnc-dev

* commit '48090be81a594b167266ddf14c8b50d41a8a0abd':

commit | commitdiff | tree

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

am 5721226e: (-s ours) am d8cdba0d: Merge "Prepare some ConnectivityService logic for fallback to Cellular change" into mnc-dev

* commit '5721226e3ed5f7b40ac3a43a9e5a71bb2f87de01':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 07:02:58 +0000 (07:02 +0000)]

am 9c2df94f: (-s ours) am 00c64f7c: Merge "Add android.net.CaptivePortal class for captive-portal-handling-app callbacks" into mnc-dev

* commit '9c2df94fbcd764e9fd9ee48cec614d47821b4464':

commit | commitdiff | tree

Tom Hudson [Thu, 27 Aug 2015 07:02:20 +0000 (07:02 +0000)]

am 6ff93d48: (-s ours) am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev

* commit '6ff93d486ca383331b69320c2d6a09e395c65367':

commit | commitdiff | tree

Bart Sears [Thu, 27 Aug 2015 07:02:06 +0000 (07:02 +0000)]

am c42b5ef1: (-s ours) am 0236e6b2: Fix the build.

* commit 'c42b5ef190a11d52387f4ebea979fc7f91fb35ac':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 07:01:55 +0000 (07:01 +0000)]

am 04745480: (-s ours) am 664251a2: Merge "Fix build" into mnc-dev

* commit '047454803997a8709f2ca17ff8ebd6fcf038500b':

commit | commitdiff | tree

Bart Sears [Thu, 27 Aug 2015 07:01:46 +0000 (07:01 +0000)]

am b7508fc1: (-s ours) am 1aa40492: Merge "Revert "Security: AccountChooser shouldn\'t auto reveal accounts."" into mnc-dev

* commit 'b7508fc159901617b5f07772b548839552bebf10':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 07:01:39 +0000 (07:01 +0000)]

am aebf04e5: (-s ours) am a2cd9c56: Merge "Camera2: Reorganize high-speed recording API slightly" into mnc-dev

* commit 'aebf04e5dfaa649874763c486a18eb7957f2dcdc':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 07:01:30 +0000 (07:01 +0000)]

am 4714c492: (-s ours) am becb4164: am a70109e4: am 019a0943: Docs: Fixes a typo.

* commit '4714c49225eec6789782c19ab6b9773b0db97542':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 07:01:15 +0000 (07:01 +0000)]

am df6a1155: (-s ours) am d75391e0: am 8d56096b: am f739ad7f: Fix typos in preview support.

* commit 'df6a11556454f146cb678c8305db729fdea9ce33':

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 07:00:31 +0000 (07:00 +0000)]

am 5e424a98: (-s ours) am 319883c8: Merge "Security: AccountChooser shouldn\'t auto reveal accounts." into mnc-dev

* commit '5e424a9854c18047ff445604ff0df75f27b32158':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 06:59:21 +0000 (06:59 +0000)]

am 2ffde8ff: (-s ours) am 83e9525c: Merge "Fix premature clearing of clearable sysui flags" into mnc-dev

* commit '2ffde8ff80c75e18c64b048e92809392b29e0fb2':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 06:58:23 +0000 (06:58 +0000)]

am 40d23c1a: (-s ours) am a681d7d9: Merge "Improve alarm manager docs." into mnc-dev

* commit '40d23c1a266125ee17132ab8a6b341ea8efcf6b7':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 06:57:52 +0000 (06:57 +0000)]

am 2a018b01: (-s ours) am 6ed4b9df: Merge "Deep-copying sucks when all you want is a borrow" into mnc-dev

* commit '2a018b01af0c4cd18c8ce8a6cdf63c120604d9a2':

commit | commitdiff | tree

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

am c2d0d090: (-s ours) am b7ba1220: Teach ImageView to recycle internal drawables

* commit 'c2d0d09015d440978d2638da96787fad6634704e':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 06:56:48 +0000 (06:56 +0000)]

am 1d8cf531: (-s ours) am 171fe6ac: Merge "Add an API for apps to query if a permisison is denied by policy." into mnc-dev

* commit '1d8cf5316ccb6faf1e94b42ef4060c24be54ac06':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 06:56:03 +0000 (06:56 +0000)]

am 75bcfeab: (-s ours) am 4ee9b23a: Merge "Delete dead code" into mnc-dev

* commit '75bcfeabb982d4fcddff12664ecf761e5d3c6e97':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 06:55:04 +0000 (06:55 +0000)]

am 172d48cf: (-s ours) am 4d8134c1: Merge "Fix black keyguard / missing status bar" into mnc-dev

* commit '172d48cf87e62aa378cd20766f452b2acdb197fa':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 06:54:08 +0000 (06:54 +0000)]

am ea0b945b: (-s ours) am d80cf910: Merge "Allow codepath changes for new OTA packages" into mnc-dev

* commit 'ea0b945b7313cd33fb0eac0687c0cc1da78bd59b':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 06:53:41 +0000 (06:53 +0000)]

am cc964850: (-s ours) am 0e7d497c: Merge "Fix issue #22328792: Fix scalability issues in AssistStructure" into mnc-dev

* commit 'cc9648500c2d528c0bfe488ab7b5a5e0fd3cd66e':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 06:53:05 +0000 (06:53 +0000)]

am 9be2a462: (-s ours) am a1790304: Do not return devices when caller has no location permission

* commit '9be2a462c829dfb09bca837c07d1197a1db6e9e0':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 06:52:24 +0000 (06:52 +0000)]

am e41a21e1: (-s ours) am adebbeba: Merge "Remote extraneous debugging log message" into mnc-dev

* commit 'e41a21e1c288a9a16c56178253993d51f5c74516':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 06:52:01 +0000 (06:52 +0000)]

am bea4eaf5: (-s ours) am 2a67840c: Fix a bad merge.

* commit 'bea4eaf567ec2b523529c6c360d2f1b127c78f57':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 06:51:35 +0000 (06:51 +0000)]

am cb23b7e8: (-s ours) am c1aebfa0: Merge "Clean up USB Manager and fix ADB." into mnc-dev

* commit 'cb23b7e89b7222a9593d0b1d93fc0e0fd7b3a415':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 06:51:17 +0000 (06:51 +0000)]

am 021ee214: (-s ours) am 968f9fdf: Merge "Slightly more precise RTL check in BoringLayout.isBoring()" into mnc-dev

* commit '021ee214c17fce863127eafad44029ff925493e8':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 06:50:56 +0000 (06:50 +0000)]

am 736249d1: (-s ours) am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev

* commit '736249d1bcc93e02ed92c8054dc1b5387ad7a944':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 06:50:27 +0000 (06:50 +0000)]

am 22d4a8b2: (-s ours) am 279678e1: Merge "Show a default icon for permissions that lack a group." into mnc-dev

* commit '22d4a8b2ddc15ebb8acfd21ea84b98097d1f8c09':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 06:49:56 +0000 (06:49 +0000)]

am ddcfb5d0: (-s ours) am 58599104: Merge "Remove data icon for WFC" into mnc-dev

* commit 'ddcfb5d0a4aa25598dbee5f95d260d80f965b454':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 06:49:32 +0000 (06:49 +0000)]

am 89928030: (-s ours) am 8969817a: Merge "Fix roaming icon when not default signal" into mnc-dev

* commit '89928030b519cb82dc6328aa52d3d31dda740582':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 06:49:14 +0000 (06:49 +0000)]

am e437b1a9: (-s ours) am 5d21f416: Merge "Dispatch onUserSwitched callbacks on handler thread" into mnc-dev

* commit 'e437b1a9ff497fa650c7979149b072fb6357c25a':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 06:48:57 +0000 (06:48 +0000)]

am 4d51987c: (-s ours) am f17d77cd: am 43a2aca4: Merge "Remove @ToBeFixed from knowntags."

* commit '4d51987c19267cdf313b9381271ee0a8c0e0c154':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 06:48:38 +0000 (06:48 +0000)]

am 14200f8a: (-s ours) am 607a040d: Merge "Add a mechanism for products to specify default active app linkages" into mnc-dev

* commit '14200f8af2924c441803319e6937fdcf7ecd4ffb':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 06:48:22 +0000 (06:48 +0000)]

am 18c1c358: (-s ours) am 322fd93f: Merge "Add missing break in AccessibilityEvent.eventTypeToString()" into mnc-dev

* commit '18c1c358c5f04b6763a5d9aad6eee46605e4b32f':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 06:47:57 +0000 (06:47 +0000)]

am ebf2ccb9: (-s ours) am 3f511882: Merge "Check location permission/appop in getScanResults" into mnc-dev

* commit 'ebf2ccb98ce4154d927d5c7e0448a512879346e3':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 06:47:19 +0000 (06:47 +0000)]

am 716e95d0: (-s ours) am b091695b: Merge "Revive NetworkInfo\'s SUSPENDED state." into mnc-dev

* commit '716e95d06d57ec6f640c6436f6903c245d18c5b5':

commit | commitdiff | tree

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

am f09116f8: (-s ours) am ee4a534b: Merge "Timeout when partitioning takes too long." into mnc-dev

* commit 'f09116f84ee9c11c97df479388cbfbccd8af9a17':

commit | commitdiff | tree

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

am 2b748765: (-s ours) am a419076e: Merge "Add grant flag support to "install-create" verb." into mnc-dev

* commit '2b74876562232fcd04cf8acbc6d99b90f8284b1a':

commit | commitdiff | tree

Mikhail Naganov [Thu, 27 Aug 2015 06:46:21 +0000 (06:46 +0000)]

am 046daf12: (-s ours) am abb8dc97: Merge "Enhance documentation of WebSettings.WebSettings method" into mnc-dev

* commit '046daf121cee3aebfa54c21eb13ba49ccb5dd017':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 06:46:13 +0000 (06:46 +0000)]

am a90b9aaf: (-s ours) am b27c379b: am 2ca4f73e: Merge "Switch LocalSocketImpl.accept() over to using Os.accept()"

* commit 'a90b9aaf56182e93ef180145d279810f7ee03d7f':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 06:46:05 +0000 (06:46 +0000)]

am cdb4a2c4: (-s ours) am 30d75e60: am c83d1819: Merge "Switch from InetUnixAddress to UnixSocketAddress"

* commit 'cdb4a2c4c250bb06f0dfa494a11b8ddee2f749d7':

commit | commitdiff | tree

Kenny Guy [Thu, 27 Aug 2015 06:45:56 +0000 (06:45 +0000)]

am 937fc8d4: (-s ours) am 7d170797: Merge "Mute correct user from device policy manager." into mnc-dev

* commit '937fc8d4dc6d27d92adf141f5dc57faa59f28034':