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

Chris Wren [Thu, 27 Aug 2015 16:43:51 +0000 (16:43 +0000)]

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

* commit '5b0a0b3daae5e692a62cfe33607b42a89a9875b7':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 16:43:36 +0000 (16:43 +0000)]

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

* commit '60d90c42d5e038c79ba51f6613c04ec11dc535f1':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 16:43:16 +0000 (16:43 +0000)]

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

* commit '2cc0837a0174f7ee9e4276b75f371c73eca5d366':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 16:42:37 +0000 (16:42 +0000)]

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

* commit '39814f8c353c5bf20a8a76cd35f3ead0a74c5035':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 16:42:07 +0000 (16:42 +0000)]

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

* commit 'e4750a1fb239bbc14542c36e6c73e3271fd1af3c':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 16:41:44 +0000 (16:41 +0000)]

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

* commit 'f9f834935f1fafea8f2c0ae98f29c480d1e51113':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 16:41:36 +0000 (16:41 +0000)]

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

* commit 'b1d36ec9a24830346e6ec23831c11e0f32bc095b':

commit | commitdiff | tree

Rubin Xu [Thu, 27 Aug 2015 16:41:28 +0000 (16:41 +0000)]

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

* commit '17d9d9470829776f7cce3851cf760221555bafc7':

commit | commitdiff | tree

Esteban Talavera [Thu, 27 Aug 2015 16:41:20 +0000 (16:41 +0000)]

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

* commit 'c97e8bbc8b1c77be2c01ce5eaf6bc772cb3d9581':

commit | commitdiff | tree

Esteban Talavera [Thu, 27 Aug 2015 16:41:13 +0000 (16:41 +0000)]

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

* commit 'fec4e800224cdd8a5af16ee23d50d79350c167a3':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 16:41:04 +0000 (16:41 +0000)]

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

* commit 'c9a38eda5325edfbd00b5e78ec54aa5a4eaeb14d':

commit | commitdiff | tree

Zhijun He [Thu, 27 Aug 2015 16:40:56 +0000 (16:40 +0000)]

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

* commit '172a893d87271c818d75e2019dbc5e305f4b4768':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 16:40:48 +0000 (16:40 +0000)]

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

* commit 'ead7fc319bfe14f2be940b813fd3a94b85efaca3':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 16:40:35 +0000 (16:40 +0000)]

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

* commit '44a68eba3e8ac7eb45e9cdb450c7c16462fabbf2':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 16:40:18 +0000 (16:40 +0000)]

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

* commit 'f67628f83a19b67240c22215d15a60a5a09cf645':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 16:39:53 +0000 (16:39 +0000)]

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

* commit '63bb13eecfa874f8f2af0df0a9c41e2308a63718':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 16:39:32 +0000 (16:39 +0000)]

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

* commit '2028b2956c37b03e2c93c14897f44ef8a25f9566':

commit | commitdiff | tree

Sanket Padawe [Thu, 27 Aug 2015 16:39:20 +0000 (16:39 +0000)]

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

* commit 'bca36af5766282ec9ab909e4d43dd0dbb6a1aab4':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 16:39:12 +0000 (16:39 +0000)]

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

* commit '54e9e0753f67ccc350d846f201ca505a1d20d7d7':

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 16:39:04 +0000 (16:39 +0000)]

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

* commit 'c617a8eede4960c1c899cd49fd4000e772695862':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 16:38:53 +0000 (16:38 +0000)]

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

* commit 'f21db58b4897237c8ae82234c4773e08ed52a68c':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 16:38:37 +0000 (16:38 +0000)]

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

* commit 'e4270ede973675ed2ba23651651a628dff10f9d5':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 16:38:18 +0000 (16:38 +0000)]

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

* commit '216d3496dc310babc22e43b15c27eaf5d64f78f5':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:37:49 +0000 (16:37 +0000)]

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

* commit '3e72c5bb1e2dbc89f7e3f4515aa75fb6f5d8a59c':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 16:37:20 +0000 (16:37 +0000)]

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

* commit '857f22925f13c8cc2a14acc3e2423fff3bc3509a':

commit | commitdiff | tree

Robin Lee [Thu, 27 Aug 2015 16:36:25 +0000 (16:36 +0000)]

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

* commit '26d86dd3d74add0b9742b539cc149a70d947fe22':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 16:35:27 +0000 (16:35 +0000)]

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

* commit 'ecadeb864c8c2d37c02aebcbedd0358dd3ac3297':

commit | commitdiff | tree

Jinsuk Kim [Thu, 27 Aug 2015 16:34:45 +0000 (16:34 +0000)]

am 6ada1fe5: 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 '6ada1fe5a7a27d0a576a562f5b49b1765260cf97':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 16:34:26 +0000 (16:34 +0000)]

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

* commit 'b27614c412c458c9984d72687a53db91261b3d8c':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 16:33:55 +0000 (16:33 +0000)]

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

* commit '9ee3e6df6afd1a87e30948350d6a2ceb4a4bed7e':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 16:33:10 +0000 (16:33 +0000)]

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

* commit 'e7e693038540e5b9a473001b5726b8e673eb62fd':

commit | commitdiff | tree

Robin Lee [Thu, 27 Aug 2015 16:32:00 +0000 (16:32 +0000)]

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

* commit '6ae4e10c9bbc5832281a1edc2a0d0b3ac4ef389e':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 16:31:06 +0000 (16:31 +0000)]

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

* commit '0e96712c8cee64c7d7fe27ec49ac5d65776fc349':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 16:30:33 +0000 (16:30 +0000)]

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

* commit 'e76b274f928aa00bf15355f519d2989b96e6c710':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 16:29:53 +0000 (16:29 +0000)]

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

* commit '21ff538e28cd51a92c2a63b23a934aea4eb13d67':

commit | commitdiff | tree

Chris Banes [Thu, 27 Aug 2015 16:29:06 +0000 (16:29 +0000)]

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

* commit '6278affe93eea146bd841c7ffeff83d052c2a2a9':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:28:39 +0000 (16:28 +0000)]

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

* commit '38d431507066164bd6e20a314373eea1a5bda4a1':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:28:20 +0000 (16:28 +0000)]

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

* commit '85e97097940f4c1a27300f7e28542d9d0b1dd14f':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 16:28:05 +0000 (16:28 +0000)]

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

* commit '49eba1510cfece93e8348faab44b94d8e2aa45e0':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 16:27:44 +0000 (16:27 +0000)]

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

* commit 'cdb1246da21d8859050651a1f895f72623cd51a8':

commit | commitdiff | tree

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

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

* commit '0cfca2aa4abcb57d14a6b0fe602b277fcb197f59':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 16:26:35 +0000 (16:26 +0000)]

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

* commit 'b594bc4c1f7519cd0c8e3356eab3e2b0fd96177f':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 16:26:15 +0000 (16:26 +0000)]

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

* commit 'fc95b2c6b71558190299be50fd1e39798032cf7a':

commit | commitdiff | tree

Paul Jensen [Thu, 27 Aug 2015 16:25:57 +0000 (16:25 +0000)]

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

* commit 'c9f9d094d09c7daa7a578c4e7105ab1d902eee34':

commit | commitdiff | tree

Tom Hudson [Thu, 27 Aug 2015 16:25:40 +0000 (16:25 +0000)]

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

* commit '4226733d0b2c7548d9c45c25ea70855172d78c4d':

commit | commitdiff | tree

Bart Sears [Thu, 27 Aug 2015 16:25:23 +0000 (16:25 +0000)]

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

* commit '541a4ef01a5e15d7a1470e6585863f97e55d50d4':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 16:25:06 +0000 (16:25 +0000)]

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

* commit '2fd25780457bdce7c50d0d45cc5a4ebce63d6f58':

commit | commitdiff | tree

Bart Sears [Thu, 27 Aug 2015 16:24:40 +0000 (16:24 +0000)]

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

* commit '56537d2a8cb62e5a96f3902399748ec4c4bbe2c0':

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 27 Aug 2015 16:24:10 +0000 (16:24 +0000)]

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

* commit '7fd73f16f1f7b8aaf0697144f83fe58bdb5398b9':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 16:23:42 +0000 (16:23 +0000)]

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

* commit '0f423e3638baf269f362fcbb7795a3b77a515193':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 16:23:15 +0000 (16:23 +0000)]

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

* commit '30e1d96c22b2d292b7787be753fdadc283d44b15':

commit | commitdiff | tree

Carlos Valdivia [Thu, 27 Aug 2015 16:23:02 +0000 (16:23 +0000)]

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

* commit 'caa07fafbe7cedf5843452f2812fd5ec59ae4973':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 16:22:50 +0000 (16:22 +0000)]

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

* commit '35f6081b61d84102e2853ec17ad7b631ef220e39':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 16:22:42 +0000 (16:22 +0000)]

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

* commit '8614ea99de0667d283c830ce66b095ff771fd9d5':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:22:34 +0000 (16:22 +0000)]

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

* commit '95b9f6d2a7a422bb1af19d5d49f8eb9f5c6b8177':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:22:27 +0000 (16:22 +0000)]

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

* commit '1fb758b33c7e818afd17eade7dffedcc6bd21810':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 16:22:18 +0000 (16:22 +0000)]

am f8650ddb: 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 'f8650ddb1ffd37777c589fcdbafff1ab6112b96a':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 16:22:08 +0000 (16:22 +0000)]

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

* commit 'b2925f3e656854e6362938b4864b08ca8c8dca7b':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 16:21:51 +0000 (16:21 +0000)]

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

* commit '7a45fe276d30fc1e99f5ae42e9c733f51344f153':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 16:21:22 +0000 (16:21 +0000)]

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

* commit '22633f53aef9a8239178fa2fdf76473e49651151':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 16:21:02 +0000 (16:21 +0000)]

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

* commit 'c4cb071a295a080abd516276d055bdb4b62cb734':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 16:20:48 +0000 (16:20 +0000)]

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

* commit 'cb806a129110aefebdae444dc3a47c769f2acc08':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 16:20:33 +0000 (16:20 +0000)]

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

* commit '1f4855b320df8dbe597f7edfcfc0724f8dab2bd3':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 16:20:21 +0000 (16:20 +0000)]

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

* commit '10345af541abdfbecd30b83f7c0057ffc9c756db':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 16:20:12 +0000 (16:20 +0000)]

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

* commit '3f8b559ecf1e37d8b07915e7aaaacd6affcde21a':

commit | commitdiff | tree

Raph Levien [Thu, 27 Aug 2015 16:19:58 +0000 (16:19 +0000)]

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

* commit '1fc229c85ae4b427a3d86b2f4c1d27c6588e2f38':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 16:19:26 +0000 (16:19 +0000)]

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

* commit '4a1123b7a48bbf6f1c48d943683cbc88519ed38a':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 16:18:36 +0000 (16:18 +0000)]

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

* commit 'ddeb2fad7f56e95ab90794e4514fc6f3e78c0277':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 16:17:26 +0000 (16:17 +0000)]

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

* commit 'bfa38f28dfc298797fe6fb10688ebcf0cc7637c5':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 16:16:52 +0000 (16:16 +0000)]

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

* commit '8c1459e23f5ce66ac9ce89e8f25de1ec435675db':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 16:16:29 +0000 (16:16 +0000)]

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

* commit '0af9792039c534f7eb39fdbbf603affb28e93cae':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 16:16:08 +0000 (16:16 +0000)]

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

* commit 'e335e86d81fa4417ea237247667834fed93829b4':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 16:15:12 +0000 (16:15 +0000)]

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

* commit 'b2167e19f8029f4f4d8a2ebece09684a30ce0a94':

commit | commitdiff | tree

Alan Viverette [Thu, 27 Aug 2015 16:14:00 +0000 (16:14 +0000)]

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

* commit '4fe38a36f8ba9ba4b7ede9b8b8cba74d632f00ee':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 16:13:10 +0000 (16:13 +0000)]

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

* commit '4cec08f46a7aad3f8359b62497c4f93eb83de215':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 16:12:48 +0000 (16:12 +0000)]

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

* commit '9c957ad7f51be29ed45f62d03e22817746272a7f':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 16:12:19 +0000 (16:12 +0000)]

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

* commit '920a0dad13449ba6b8e0190bbd20cb2d47c349dc':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 16:11:39 +0000 (16:11 +0000)]

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

* commit '0e817cf5c03197537c847b990b169357169260e9':

commit | commitdiff | tree

Mikhail Naganov [Thu, 27 Aug 2015 16:10:49 +0000 (16:10 +0000)]

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

* commit '90080e5d2390b49234f25f9025e92e51a60c79a6':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 16:10:23 +0000 (16:10 +0000)]

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

* commit 'a5bbd5815f1c551f385ae2eed8f4e34959f5ed0f':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 16:10:06 +0000 (16:10 +0000)]

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

* commit '364c31640ceb16a5c1035f19bc49997a138af0be':

commit | commitdiff | tree

Kenny Guy [Thu, 27 Aug 2015 16:09:50 +0000 (16:09 +0000)]

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

* commit 'fe2e963c926954ebb1af08cfdd8eba8b249a02a2':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 16:09:21 +0000 (16:09 +0000)]

am 6b2c26e1: am 970d2a09: (-s ours) am 14b50394: Reduce overly aggressive use of narrowAm / narrowPm.

* commit '6b2c26e16f4599c253690efcd7a3ab90a229ac8d':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 16:08:40 +0000 (16:08 +0000)]

am 34c8fc35: am 4cb773a8: (-s ours) am 8cb9fd84: am 6051cd3e: am 1809f534: Docs: Changes to the "Support" preview page.

* commit '34c8fc353cae7be7babc5eb121dcd4e4464c36a2':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 16:08:04 +0000 (16:08 +0000)]

am 87a4c123: am 303dd9a2: (-s ours) am 872c2482: am 95fc4f45: am 9d5df5ca: Merge "Doc change: add x86 to emulator spec." into mnc-preview-docs

* commit '87a4c1232aa0b48eb6b404b64c2960645ec0114f':

commit | commitdiff | tree

David Friedman [Thu, 27 Aug 2015 16:07:48 +0000 (16:07 +0000)]

am 8e82cd8a: am 49cd4eac: (-s ours) am 15d1c1c9: am 064f8b68: am dde5e263: Merge "Docs: Fixes to the quick-view wrapper on non-English "about lollipop" pages." into mnc-preview-docs

* commit '8e82cd8aeab976d3c489232bb98a30af02597da6':

commit | commitdiff | tree

Dirk Dougherty [Thu, 27 Aug 2015 16:07:30 +0000 (16:07 +0000)]

am e56fa67a: am e075053b: (-s ours) am 492123d5: am 119683d1: am 0ffd7158: Merge "Doc change: minor updates to KIs and AFW behavior changes." into mnc-preview-docs

* commit 'e56fa67abc73dbfb5d2d577a2f2d7b741cfb18e3':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 16:07:12 +0000 (16:07 +0000)]

am 1f989730: am d92f643a: (-s ours) am 748bc36f: Remove "final" qualifier from AuthenticationResult

* commit '1f989730d0eac3bd03c4ea5d95d2525b07634ffd':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 16:06:53 +0000 (16:06 +0000)]

am f5879b72: am e9402b7e: (-s ours) am 348988c5: Merge "Fix permissions on TelephonyManager" into mnc-dev

* commit 'f5879b7289f2228326d701ea0fed712f80c52fb1':

commit | commitdiff | tree

Sanket Padawe [Thu, 27 Aug 2015 16:06:15 +0000 (16:06 +0000)]

am dbe503bb: am bae7a4d8: (-s ours) am 58295e71: Merge "Add Null checks while processing pairing cancel intent" into mnc-dev

* commit 'dbe503bb679960edd26c3e853a8768e2ee1cd8e7':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 16:05:32 +0000 (16:05 +0000)]

am 116f8f92: am 0d5c30d9: (-s ours) am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev

* commit '116f8f926c03469d2829e104f42d51e90e0a1d71':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 16:05:12 +0000 (16:05 +0000)]

am 77f7169f: am 3f66835c: (-s ours) am de335a7d: Merge "Fix Permission Typo." into mnc-dev

* commit '77f7169f242646e8ffd1333506717f8d19bca3c2':

commit | commitdiff | tree

Mady Mellor [Thu, 27 Aug 2015 16:05:04 +0000 (16:05 +0000)]

am 650fb285: am 809cdd57: (-s ours) am 84005b40: Merge "Use hint text to position handle / floating tool bar popups" into mnc-dev

* commit '650fb285e2e0186e4c05a114bd263476b4bd7cee':

commit | commitdiff | tree

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

am 061c2f61: am d98e6dc2: (-s ours) am 6638c182: Merge "Fix reset permissions on clear data and package uninstall." into mnc-dev

* commit '061c2f611a27e63a8e827290ea2355d08556b8b9':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 16:04:47 +0000 (16:04 +0000)]

am 2715ff4a: am 11be2916: (-s ours) am 9b84b5c5: Merge "Update storage group icon" into mnc-dev

* commit '2715ff4a5c77e9978f393b3ec36c7316b4cd3827':

commit | commitdiff | tree

Jack Yu [Thu, 27 Aug 2015 16:04:39 +0000 (16:04 +0000)]

am 127a57a8: am 99b0a02f: (-s ours) am 6b7a0784: Merge "Grant SMS permissions to Cell Broadcast receiver which emergency/non-emergency broadcast messages from the network." into mnc-dev

* commit '127a57a868aa817359db56c16cd786304968f2ec':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 16:04:30 +0000 (16:04 +0000)]

am eba53895: am ac3fb15f: (-s ours) am 705ba960: Merge "Qualify the uid with the userId when granting permissions" into mnc-dev

* commit 'eba53895a044bfd37f6ced4c0b2219af42080baa':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 16:04:22 +0000 (16:04 +0000)]

am acb78d55: am 6a231f48: (-s ours) am dad62b9f: Merge "Finish already paused activity if it should be finished after pausing" into mnc-dev

* commit 'acb78d55ab039891b2bd2cbcbd3c8ecc877ea526':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 16:04:07 +0000 (16:04 +0000)]

am fd1b7a66: am ddcaa330: (-s ours) am 9f4c4ee6: Merge "Fix crash looping SystemUI." into mnc-dev

* commit 'fd1b7a66c11fbcd3a743ff0ec47161b790c9278f':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 16:03:44 +0000 (16:03 +0000)]

am 0050a6fd: am 7ac64f1d: (-s ours) am 9201385f: Merge "Cleaned up the clipping logic for the dismiss motion." into mnc-dev

* commit '0050a6fd7d13f916c9e1904195176f5bb646867f':