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

Narayan Kamath [Thu, 27 Aug 2015 17:05:10 +0000 (17:05 +0000)]

am bec9570e: am 74b04315: (-s ours) am b9f170ff: am b4db7923: Merge "Delete some obsolete test code."

* commit 'bec9570e55410a3f5ff5a3c95ae6c76d809c88cc':

commit | commitdiff | tree

Mathieu Chartier [Thu, 27 Aug 2015 17:04:50 +0000 (17:04 +0000)]

am dc9751ce: am 30e8a36d: (-s ours) am ad4a285a: am ebac4d1b: Merge "Change conditionallyCheckInstanceCounts to use countInstancesOfClasses"

* commit 'dc9751ce543cff248896411fb17ad09cd1d27477':

commit | commitdiff | tree

xinhe [Thu, 27 Aug 2015 17:04:25 +0000 (17:04 +0000)]

am 94dc4b61: am 27ad72ef: (-s ours) am f1c2a1f7: Merge "Need to disable 5GHz bands for WiFi tethering in Japan" into mnc-dev

* commit '94dc4b6165e29c0fc3db90a08a1e829323830aa9':

commit | commitdiff | tree

Yorke Lee [Thu, 27 Aug 2015 17:04:03 +0000 (17:04 +0000)]

am edcec5d2: am 043cf1af: (-s ours) am b63b031c: Merge "Standardize stateToString return values" into mnc-dev

* commit 'edcec5d2473773ae52e49a69c4c7522d4980a2ae':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 17:03:35 +0000 (17:03 +0000)]

am 0b4e41b8: am 76ff0acd: (-s ours) am d69a82c1: Merge "Allow array of required permissions in sendBroadcast" into mnc-dev

* commit '0b4e41b814870383b42971e41d690e9287c9d16c':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 17:03:12 +0000 (17:03 +0000)]

am 3aeabd63: am e6644996: (-s ours) am d3719ab0: Merge "Better handling of storage paths." into mnc-dev

* commit '3aeabd632c0490d2c1f787402b3540a41610f2ff':

commit | commitdiff | tree

Chien-Yu Chen [Thu, 27 Aug 2015 17:02:56 +0000 (17:02 +0000)]

am d756e793: am 5d12a934: (-s ours) am 6eec00ec: Merge "Camera: Reconnect after camera service crashes" into mnc-dev

* commit 'd756e79342bf75b2303e2a28fa5ba925cab3667f':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 17:02:40 +0000 (17:02 +0000)]

am 57bef2b2: am 2f2c9524: (-s ours) am 5cf30c60: Merge "Pass wifi ap state through to tile when receiver triggered." into mnc-dev

* commit '57bef2b2d89038fb44b6012d608609dfb3db6d51':

commit | commitdiff | tree

Andrew Solovay [Thu, 27 Aug 2015 17:02:26 +0000 (17:02 +0000)]

am 6aa834ca: am dfa2f618: (-s ours) am 353886b2: am e67416ec: am 4859a612: Merge "docs: Clarified how to find out when a switch is toggled" into mnc-preview-docs

* commit '6aa834ca601f62c350483ea11e76fd726e7ba55a':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 17:02:10 +0000 (17:02 +0000)]

am 2e8fd142: am f3eaef21: (-s ours) am fb973240: Merge "Fix status bar bt accessibility message" into mnc-dev

* commit '2e8fd142f2d73e29177145667936fa696f899ae2':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 17:01:42 +0000 (17:01 +0000)]

am 73d72bf7: am 59d71f17: (-s ours) am 2061049d: Merge "Move wifi accessibility strings to SettingsLib" into mnc-dev

* commit '73d72bf71fd4fe7703d4d088b59456fa304c9fac':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 17:01:01 +0000 (17:01 +0000)]

am 76029cc5: am 493244d3: (-s ours) am 92a3914f: Merge "BatteryStats: Remove uid_cputime Slog.wtf for high cpu times" into mnc-dev

* commit '76029cc5e2ec7bf11d3b2dcd6fd23d8c9dd2d08c':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 17:00:25 +0000 (17:00 +0000)]

am 479bd207: am 90eb7035: (-s ours) am 8b6d5b6b: Merge "Clear binder id when determining external storage state" into mnc-dev

* commit '479bd207be187b9522b65b28264b561aef547169':

commit | commitdiff | tree

Dan Sandler [Thu, 27 Aug 2015 17:00:13 +0000 (17:00 +0000)]

am 696c4942: am e412ced1: (-s ours) am 66cc6bb6: Merge "Allow notification strings to be unredacted in dump output." into mnc-dev

* commit '696c4942961ef7d81e4df0d4357b1af67d51766c':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 17:00:02 +0000 (17:00 +0000)]

am 46e40aeb: am 8fcd8e8b: (-s ours) am 46d1864c: Merge "Make get_accounts a runtime permissions again" into mnc-dev

* commit '46e40aeb8e0fc1040058ac2b1bdd1530c192366d':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 16:59:54 +0000 (16:59 +0000)]

am aeda643f: am 1e935acb: (-s ours) am f5adce87: Merge "Removed logging for the empty keyguard" into mnc-dev

* commit 'aeda643fa1a548074a66e6cc96e37c33e00b7af1':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 16:59:46 +0000 (16:59 +0000)]

am 6d0ec4f6: am ed534e34: (-s ours) am 51b4e97a: Merge "Add checks for READ_PRIVILEGED_PHONE_STATE." into mnc-dev

* commit '6d0ec4f67d8e144b31c2055c9a0a14bac5752e19':

commit | commitdiff | tree

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

am 4717aa9c: am 1715b0ca: (-s ours) am fe03a84b: Merge "Fix QS labels on language change" into mnc-dev

* commit '4717aa9cfd3f2fa1a6da0c1783cdf78fd2127edb':

commit | commitdiff | tree

Marco Nelissen [Thu, 27 Aug 2015 16:59:30 +0000 (16:59 +0000)]

am 38a3e80c: am 82419868: (-s ours) am 3ced9617: Merge "Use original path if translated path doesn\'t exist" into mnc-dev

* commit '38a3e80c6e26a4c7ed5aa027fc5adc32b759d3b2':

commit | commitdiff | tree

Craig Lafayette [Thu, 27 Aug 2015 16:59:23 +0000 (16:59 +0000)]

am 29171a64: am 3a5d0fa7: (-s ours) am 2f0116fa: Merge "Prevent null allowableAccounts from crashing" into mnc-dev

* commit '29171a640633d0cc393e24eb1c821f218501e198':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 16:59:04 +0000 (16:59 +0000)]

am f526e07a: am 65d8b59b: (-s ours) am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev

* commit 'f526e07aa5a20e6c7a23822764dd58ee5084bad5':

commit | commitdiff | tree

Alex Klyubin [Thu, 27 Aug 2015 16:58:36 +0000 (16:58 +0000)]

am bbcf88b3: am c9125d69: (-s ours) am 10633c96: Merge "Fix Android Keystore key factories to obey JCA contract." into mnc-dev

* commit 'bbcf88b35236b6a31d691cbda67806ff620b3f6c':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 16:58:08 +0000 (16:58 +0000)]

am e9685eb5: am fc5ffc4c: (-s ours) am 12952c79: Merge "Allow FloatingToolbar to be outside of the attached window." into mnc-dev

* commit 'e9685eb570287434f70890ff56462ef9ccd3abce':

commit | commitdiff | tree

Ronghua Wu [Thu, 27 Aug 2015 16:57:53 +0000 (16:57 +0000)]

am ab606e7d: am 86092631: (-s ours) am 148c7c5c: Merge "media: Implement getAchievableFrameRatesFor with measured frame rate." into mnc-dev

* commit 'ab606e7db69e3df5df44dd9a00c5243926ac4467':

commit | commitdiff | tree

Andrei Stingaceanu [Thu, 27 Aug 2015 16:57:39 +0000 (16:57 +0000)]

am 51188ef5: am 085e8728: (-s ours) am 8af7432c: Merge "Fix "Select All" in extracted mode" into mnc-dev

* commit '51188ef51475ae3bf4d2380884a56f323416db0a':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 16:57:30 +0000 (16:57 +0000)]

am a6904117: am 5b02dfad: (-s ours) am f5e20ec3: Merge "Retrieve resources for apps, even if not installed for current user." into mnc-dev

* commit 'a6904117f8db1eaf3135be22948743ad03444c29':

commit | commitdiff | tree

Andrei Stingaceanu [Thu, 27 Aug 2015 16:57:21 +0000 (16:57 +0000)]

am 2d1d0f89: am 028492f2: (-s ours) am a9b9907f: Merge "Fix insertion handle disappearing in extract mode" into mnc-dev

* commit '2d1d0f8993c40751d4dcb896d81aa26cd05fbce0':

commit | commitdiff | tree

Erik Kline [Thu, 27 Aug 2015 16:57:10 +0000 (16:57 +0000)]

am 3f7f5c52: am 148d07c3: (-s ours) am 77612940: Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev

* commit '3f7f5c522526d50cf89b36f1123bf2f1af253084':

commit | commitdiff | tree

Zach Johnson [Thu, 27 Aug 2015 16:57:00 +0000 (16:57 +0000)]

am ec90bf47: am 7f28528e: (-s ours) am 569ff225: Fix BluetoothSocket file descriptor leak

* commit 'ec90bf47fc313ce8e77e9e81bca0c51d8023bb59':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 16:56:37 +0000 (16:56 +0000)]

am 51b7835f: am 5cb3eefe: (-s ours) am 8017c647: Fix build

* commit '51b7835fb3522b917221c1667c92b1ed6036a399':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 16:55:41 +0000 (16:55 +0000)]

am 237e7b9e: am 325d7bae: (-s ours) am 8cee6587: Merge "Teach storage appops." into mnc-dev

* commit '237e7b9ed1e1210b43e39c1525dd48a70fd27401':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 16:54:36 +0000 (16:54 +0000)]

am 7050fb04: am f8d2468e: (-s ours) am 4b9b3e47: Merge "Default browser should not supersede intent filter priorities" into mnc-dev

* commit '7050fb04b1a236a7d8a32875a0d9eda130924b5b':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 16:54:03 +0000 (16:54 +0000)]

am 8c9f55c7: am c79e2832: (-s ours) am fc2bc7f1: Merge "Check signatures of privileged persistent apps for granting defailt permissions" into mnc-dev

* commit '8c9f55c704a13620d76dca18e9dd9bf2e48a386b':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 16:53:40 +0000 (16:53 +0000)]

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

* commit '3b8a6ed17e4b51c5545488a7c43a21c746e47f64':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 16:53:20 +0000 (16:53 +0000)]

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

* commit 'bed5a6dca8074b0cdad3443fe3db62f8da8959e0':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 16:52:39 +0000 (16:52 +0000)]

am 2007c620: 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 '2007c620d3f2a381e500ab7d093cf52261ea5e94':

commit | commitdiff | tree

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

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

* commit '2eb674ff644223ce7a97aedea92734b351ec7f81':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 16:50:42 +0000 (16:50 +0000)]

am 20dd114d: 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 '20dd114d9d5c8dd9df36a038e9e7705eb07ba94e':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 16:49:54 +0000 (16:49 +0000)]

am bd2638a6: 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 'bd2638a69b0fa1fc3f65f51e964b9e3ff7b1f31c':

commit | commitdiff | tree

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

am 1cfd0782: 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 '1cfd07827803c0bd8f6ea2327b384d160caf3324':

commit | commitdiff | tree

Eric Gilmore [Thu, 27 Aug 2015 16:48:57 +0000 (16:48 +0000)]

am 9877c207: 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 '9877c207b52186ed2424ca810d15bab936d66437':

commit | commitdiff | tree

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

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

* commit 'bed7094129f1383407b33080e39cf29cfc9a6ced':

commit | commitdiff | tree

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

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

* commit 'c0cf5285c423c369a22a329ffcb6d1bc233b9a89':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 16:47:07 +0000 (16:47 +0000)]

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

* commit '39a6853aff3f83538815fb67526dc94e2ed3ed77':

commit | commitdiff | tree

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

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

* commit 'e33ce0cf854aa4fc429ab9f1364956d1306e5562':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 16:46:32 +0000 (16:46 +0000)]

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

* commit '131ff02e9dcd9010dce67b6d29fc2e06349384c1':

commit | commitdiff | tree

Vinit Deshpande [Thu, 27 Aug 2015 16:46:12 +0000 (16:46 +0000)]

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

* commit '7ef48e40b5a461503ac8e9be09e816d5c50e97c2':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 16:45:29 +0000 (16:45 +0000)]

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

* commit '2c7d0ceba840d9d5255bf5769c4ccdaa76df5e88':

commit | commitdiff | tree

Aravind Akella [Thu, 27 Aug 2015 16:44:43 +0000 (16:44 +0000)]

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

* commit '53cd92a04dc9483eb4b95da80c9b44f2c8e71fec':

commit | commitdiff | tree

Etan Cohen [Thu, 27 Aug 2015 16:44:22 +0000 (16:44 +0000)]

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

* commit '9084f794f39e99afbd105e2956c37f2c3c642001':

commit | commitdiff | tree

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

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

* commit '84ef15dbc088b1226413942d64448bf947bfa18a':

commit | commitdiff | tree

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':