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

Mady Mellor [Thu, 27 Aug 2015 18:40:53 +0000 (18:40 +0000)]

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

* commit '259664d6a7a5044da8e48518f12d76563bf72cad':

commit | commitdiff | tree

Ruben Brunk [Thu, 27 Aug 2015 18:40:36 +0000 (18:40 +0000)]

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

* commit 'e20c0350b510d8dfa52cf940686ed6970aecea37':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:40:15 +0000 (18:40 +0000)]

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

* commit '6dbeec3aacbc55289bd4c73258dd7a11ae1a5626':

commit | commitdiff | tree

Filip Gruszczynski [Thu, 27 Aug 2015 18:39:46 +0000 (18:39 +0000)]

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

* commit 'c6bd2e1e9d7606a25cb3a7eaf1d636e3e2c8a1a7':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:39:18 +0000 (18:39 +0000)]

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

* commit '65aceef50cd174edf10c6c3400d21eef35809cf5':

commit | commitdiff | tree

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

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

* commit 'cf2dedfd4459c866e49af8e4650a338fa6736746':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:38:06 +0000 (18:38 +0000)]

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

* commit 'b67af9d88ac1b04db096eace6b002e2a7e9ca19d':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:37:32 +0000 (18:37 +0000)]

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

* commit 'ceeb92072f4dfeeefe80319df688be3a3214bfb6':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:37:08 +0000 (18:37 +0000)]

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

* commit '3a9537c75fa14c7447560e892169a777d4931875':

commit | commitdiff | tree

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

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

* commit '9549afba91f534e503b642d5fc1ae3f55fe41c4a':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:36:33 +0000 (18:36 +0000)]

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

* commit 'f0103c996ae25318c997a1967bcc529d0b0734e0':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:36:05 +0000 (18:36 +0000)]

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

* commit '1b8b549f17df17f7c2797073f2e7c267e9054b31':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:35:37 +0000 (18:35 +0000)]

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

* commit '54ce3a0d590224af52633f047eb1c4e705e9e305':

commit | commitdiff | tree

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

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

* commit '3a69ed5d6277c941ea4a7d7766a21c4cf55793e2':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:35:03 +0000 (18:35 +0000)]

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

* commit 'de26af621536b9be710eafb6a481f0a672212702':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:34:49 +0000 (18:34 +0000)]

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

* commit 'cbb686644eef8bac1c64abf5c3d2b32cbd1b0807':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 18:34:37 +0000 (18:34 +0000)]

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

* commit '560ca8fa035fa44e659111a89faa69f0c962f6a5':

commit | commitdiff | tree

Phil Burk [Thu, 27 Aug 2015 18:34:23 +0000 (18:34 +0000)]

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

* commit 'f356caa20d02818baa68513a62fc2ef189f7e606':

commit | commitdiff | tree

Tim Volodine [Thu, 27 Aug 2015 18:34:07 +0000 (18:34 +0000)]

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

* commit '6b7c8b9d573cb15cbf06d301ef2fc87e3403ee07':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:33:42 +0000 (18:33 +0000)]

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

* commit 'd3c7ffa21dcb2bb4c9fbe92171feb3a413a2a7ee':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 18:33:16 +0000 (18:33 +0000)]

am c242dd4b: (-s ours) 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 'c242dd4b45330877cc07d9f76cb5bf40309b13c2':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:32:53 +0000 (18:32 +0000)]

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

* commit 'ec4aae642a2b802d5800c714aa4ebbee10faf4ad':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:32:39 +0000 (18:32 +0000)]

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

* commit '6dc9b31d628b52dc05adc70534bb9d5d1fa2f869':

commit | commitdiff | tree

Erik Kline [Thu, 27 Aug 2015 18:32:24 +0000 (18:32 +0000)]

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

* commit 'c729f4da9f2e2803368f4f6b4ab45943b0e75186':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 18:32:11 +0000 (18:32 +0000)]

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

* commit '0fc1b8895a264933593a7573d82055d1341d24ef':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:32:00 +0000 (18:32 +0000)]

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

* commit 'b9eee894bb46777e80de437bd79fb7341a33f11c':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:31:47 +0000 (18:31 +0000)]

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

* commit '62b769fb1baac94cb9554e850251ec7806ec2a40':

commit | commitdiff | tree

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

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

* commit '718239392bb929c3d706b0238bd96ca2e2246d9e':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:31:15 +0000 (18:31 +0000)]

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

* commit 'e9c9ca415e994f446018210d976a02f84ff5291c':

commit | commitdiff | tree

Selim Cinek [Thu, 27 Aug 2015 18:30:58 +0000 (18:30 +0000)]

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

* commit '68d0dbc1bd15e167853b9e64b9ba1340a38e2937':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 18:30:35 +0000 (18:30 +0000)]

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

* commit '05d87e3bc32dfe5d5d3ad44cf8414db83bc5b658':

commit | commitdiff | tree

Chris Banes [Thu, 27 Aug 2015 18:30:13 +0000 (18:30 +0000)]

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

* commit 'c64b0e870f22fbd70cbc729cd742dd49618c7b49':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:30:02 +0000 (18:30 +0000)]

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

* commit 'ac859598cc4fe3284ca093b7eb8d255afd8307a6':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 18:29:53 +0000 (18:29 +0000)]

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

* commit 'b7114ad1275324a3fa0c0b4cce655709c4db11e0':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:29:45 +0000 (18:29 +0000)]

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

* commit '51f50946d6b37da3e89e141a926f607a774ae617':

commit | commitdiff | tree

Andreas Gampe [Thu, 27 Aug 2015 18:29:38 +0000 (18:29 +0000)]

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

* commit '63c74e6b9b6e29dc2d0b596493ff5eae65bc15ce':

commit | commitdiff | tree

Robert Greenwalt [Thu, 27 Aug 2015 18:29:30 +0000 (18:29 +0000)]

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

* commit '50f36f8f5d0f1e579722e76a92470d541a1c1468':

commit | commitdiff | tree

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

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

* commit 'f5ff43568df0646d23aa36de3f68eb521eee95cb':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:29:15 +0000 (18:29 +0000)]

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

* commit 'ed8cf64962332b128f8e230367cdc817620170f8':

commit | commitdiff | tree

Andrei Stingaceanu [Thu, 27 Aug 2015 18:29:04 +0000 (18:29 +0000)]

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

* commit '60796c5260609dfbbce73f28fb7e66e35ccc9da4':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 18:28:35 +0000 (18:28 +0000)]

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

* commit '1aca9d549030ecffd51b73e3446da744a5ef368e':

commit | commitdiff | tree

Jim Miller [Thu, 27 Aug 2015 18:28:20 +0000 (18:28 +0000)]

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

* commit '264415133368b0b3b48715f9e9559a39483d4b4f':

commit | commitdiff | tree

Ying Wang [Thu, 27 Aug 2015 18:28:09 +0000 (18:28 +0000)]

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

* commit 'ace64de0efdc298b2f6a2d9d1bff10f76a5b01a0':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 18:27:58 +0000 (18:27 +0000)]

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

* commit '9416c5012c721197f74f072a3d34cb1dd159b937':

commit | commitdiff | tree

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

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

* commit 'fd7533cf954f16a2aa77283e15952d05e741f02b':

commit | commitdiff | tree

Amit Mahajan [Thu, 27 Aug 2015 18:27:42 +0000 (18:27 +0000)]

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

* commit '0be97aa842d81e80e38e547d6fd8cd2075bd7b59':

commit | commitdiff | tree

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

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

* commit '462ec1042f4755db6cb40d32b27a513912c1f56b':

commit | commitdiff | tree

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

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

* commit 'bc28387690fbe061edbe2a6dc3aac6f2dc581df4':

commit | commitdiff | tree

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

am 272958b3: am 1f4b21b9: (-s ours) am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev

* commit '272958b33b5d095b2c08bdd23b3a74b833763bf2':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 18:26:54 +0000 (18:26 +0000)]

am 708d8b1f: am fe4ff64a: (-s ours) am f199ac84: Merge "Set support flag for custom layouts for RecyclerView." into mnc-dev

* commit '708d8b1f7eaa87b17dace4e9be407f60ba3700ab':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 18:26:28 +0000 (18:26 +0000)]

am 2db6f494: am 0e235f47: (-s ours) am 0526ee52: Merge "Don\'t rely on broadcast intent for waking up input method." into mnc-dev

* commit '2db6f4944a4aaaf4a84921ae10f9669dd2d45ac5':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 18:25:59 +0000 (18:25 +0000)]

am 35fe7782: am b8719e27: (-s ours) am 49fcfdd4: Merge changes I9c294329,Ie4db5d28 into mnc-dev

* commit '35fe7782d7c58b5d233458e3002c1ac808025161':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 18:25:23 +0000 (18:25 +0000)]

am e7146229: am a6d25c84: (-s ours) am f33c0f85: Merge "CalendarView rendering: use R.styleable to find attr." into mnc-dev

* commit 'e714622931cf08d566e3cd690f39d5332a7c4fed':

commit | commitdiff | tree

Stephen Hines [Thu, 27 Aug 2015 18:24:47 +0000 (18:24 +0000)]

am 9d3bff55: am b3a1674a: (-s ours) am ed3ffe0f: am 6430812a: Merge "RenderScript: implement a Script entry point for calling a reduce-style kernel."

* commit '9d3bff55b54ed99f7f8c29c713070d9137542f98':

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 18:24:17 +0000 (18:24 +0000)]

am 88bacc05: am 43250dd3: (-s ours) am a2bf7616: Merge "Add a wm command to dismiss the keyguard." into mnc-dev

* commit '88bacc05671da5079f14492593afb6bd17f01adb':

commit | commitdiff | tree

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

am bb9c060f: am 29e3f766: (-s ours) am 607bc34f: Merge "Reset permissions and app links when clearing app preferences - framework" into mnc-dev

* commit 'bb9c060f5ef9dc0ca2e6c225d10c0c5f00651c39':

commit | commitdiff | tree

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

am 756f91e2: am bb8bdd71: (-s ours) am 258e630a: Merge "Shut down UiAutomationConnection without a lock held" into mnc-dev

* commit '756f91e229dd110e6639b51fb23ceede5e840642':

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 18:22:51 +0000 (18:22 +0000)]

am 8ac9451e: am 99bad6f0: (-s ours) am cc855ad7: Merge "Properly synchronize interactivity state." into mnc-dev

* commit '8ac9451ec0593d160bacc31ea7fbfce8e0aac8eb':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:22:26 +0000 (18:22 +0000)]

am bd45e79c: am dbb0f24c: (-s ours) am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev

* commit 'bd45e79c70eacf363e11069f71040923a0171da8':

commit | commitdiff | tree

Julia Reynolds [Thu, 27 Aug 2015 18:22:01 +0000 (18:22 +0000)]

am 2ca349c0: am 621b4870: (-s ours) am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev

* commit '2ca349c0f001d00a656cb5b59406d3cfdcaa5464':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:21:23 +0000 (18:21 +0000)]

am db77a90b: am 09596431: (-s ours) am 1d071ce9: Make sure expandingFinished gets called when going into QS

* commit 'db77a90bf8d3afa1d7672ca46ebdecc163fd7465':

commit | commitdiff | tree

Kenny Root [Thu, 27 Aug 2015 18:21:03 +0000 (18:21 +0000)]

am 9a2a1a39: am 3b5b9c73: (-s ours) Merge branch \'mnc-dev-plus-aosp\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into mnc-dev-plus-aosp

* commit '9a2a1a39e826d2a2472e76da86060efbd5b22cd6':

commit | commitdiff | tree

Wenchao Tong [Thu, 27 Aug 2015 18:20:27 +0000 (18:20 +0000)]

am 614e9457: am 1839b107: (-s ours) am bf3a24d5: Merge "Ignore the active network scorer when checking for idleness" into mnc-dev

* commit '614e94572048a265adc3d4d90e5b33319ca99604':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 18:19:51 +0000 (18:19 +0000)]

am ccef1550: am b9ce7374: (-s ours) am 2abf0f24: Fix a race condition that could cause lockup

* commit 'ccef15506802c9812836fdab384cf3cc5a68f2bf':

commit | commitdiff | tree

Amith Yamasani [Thu, 27 Aug 2015 18:19:12 +0000 (18:19 +0000)]

am eceae9cb: am ba3aa080: (-s ours) am b3e40760: Merge "Avoid a deadlock between PMS and AppOpsService" into mnc-dev

* commit 'eceae9cb8ec15297c4228822834efb0aa35c29a2':

commit | commitdiff | tree

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

am bdb1902b: am 85e0511b: (-s ours) am 304b01c2: Merge "Document what algorithms Android Keystore supports." into mnc-dev

* commit 'bdb1902b1d3168cdb3589785fb684f1b8ae371e5':

commit | commitdiff | tree

Junda Liu [Thu, 27 Aug 2015 18:18:21 +0000 (18:18 +0000)]

am be0fbe36: am 59ae2da6: (-s ours) am 859551f7: Merge "Remove volte_feature_disabled as carrier config handled it." into mnc-dev

* commit 'be0fbe3683347e4a38030a349f6083e5419d5664':

commit | commitdiff | tree

Jean-Michel Trivi [Thu, 27 Aug 2015 18:18:08 +0000 (18:18 +0000)]

am 1e140971: am 9e4253f1: (-s ours) am 7f9e9012: Merge "RingtoneManager: query results depend on caller permission" into mnc-dev

* commit '1e140971c7be07e406f871d75136f86c9ee2447e':

commit | commitdiff | tree

Jack Yu [Thu, 27 Aug 2015 18:17:52 +0000 (18:17 +0000)]

am d6d5b46f: am 8c8c82d1: (-s ours) am e21722a3: Merge "Allow carriers to force disable ETWS/CMAS test messages." into mnc-dev

* commit 'd6d5b46f083ff7523b1b383d0e0e3101b1b702ab':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 18:17:36 +0000 (18:17 +0000)]

am 872c6a92: (-s ours) am 2a883052: (-s ours) am 13edc160: (-s ours) Import translations. DO NOT MERGE

* commit '872c6a922da20ccc55cf9e8ebfef20a1bb3c74cf':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 18:17:17 +0000 (18:17 +0000)]

am 988273b1: am d1065992: (-s ours) am 06b93a48: Merge "Revert "UsbDeviceManager: fix b/21429947 regression"" into mnc-dev

* commit '988273b1edb80370075af9fdd3f76a36df7677ad':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:16:47 +0000 (18:16 +0000)]

am accd0323: am 1d76cf00: (-s ours) am 492fc648: Merge "Grant record audio to system reco service by default" into mnc-dev

* commit 'accd0323a54c98e38bbbc06a8b4443a4bd683390':

commit | commitdiff | tree

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

am cafe4532: am 93c0be91: (-s ours) am f90ed330: Merge "UsageStats: Reduce log spam during time change" into mnc-dev

* commit 'cafe45320d504657fa4daa08f5f3a1e2849a6dd7':

commit | commitdiff | tree

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

am fcecc4e9: am da56bea4: (-s ours) am 4a368659: Merge "Fix issue #22414729: Checkin start clock time is different from hsitory reset time" into mnc-dev

* commit 'fcecc4e95fbbd8a35938ad3c752d104b9dac4872':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:15:48 +0000 (18:15 +0000)]

am 03e24899: am a23076db: (-s ours) am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev

* commit '03e24899fba5b55ee920ae70640a49e3296a99a8':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 18:15:36 +0000 (18:15 +0000)]

am 2a899c1c: am aa0d9387: (-s ours) am 5507bb41: Merge "Fix issue #22653116: Google App crashing on NYT app" into mnc-dev

* commit '2a899c1c5bba1edd717957860abf5ee3c17f0856':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:15:21 +0000 (18:15 +0000)]

am 72ac7f3b: am 4b4aceb5: (-s ours) am 41a62e11: Merge "Do not show normal permissions in sideloading UI" into mnc-dev

* commit '72ac7f3b972bd4fbd42f06a04ed3367edaf54149':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:15:05 +0000 (18:15 +0000)]

am f6e847b5: am 522dd937: (-s ours) am a0a71d8a: Merge "Fixed a typo" into mnc-dev

* commit 'f6e847b502be1ddc78f52ece99052fce4145d7c3':

commit | commitdiff | tree

Adam Lesinski [Thu, 27 Aug 2015 18:14:47 +0000 (18:14 +0000)]

am 5c1f7290: am 4ddc598c: (-s ours) am 05f5cb45: Merge "UsageStats: Gracefully handle corrupt filenames" into mnc-dev

* commit '5c1f7290a9eb31d4316f5f24791be002ca54f331':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 18:14:17 +0000 (18:14 +0000)]

am 2b6a28e5: am 89173cef: (-s ours) am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev

* commit '2b6a28e592e2d9217192b9572e0a1a4bdfd1bece':

commit | commitdiff | tree

Jae Seo [Thu, 27 Aug 2015 18:13:58 +0000 (18:13 +0000)]

am af86173d: am ffdc6a50: (-s ours) am eec3d9e3: Merge "TIF: Enable hardware acceleration on overlay" into mnc-dev

* commit 'af86173d508c63818eed357083f768be2848d337':

commit | commitdiff | tree

Svetoslav Ganov [Thu, 27 Aug 2015 18:13:44 +0000 (18:13 +0000)]

am f8c6e203: am 7cd0c3a2: (-s ours) am 3d6f6060: Merge "Add a privileged permission to get user accounts" into mnc-dev

* commit 'f8c6e203956dae0ccab618ac478bb1d23d964524':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 18:13:31 +0000 (18:13 +0000)]

am 7df89722: am a58966d2: (-s ours) am 3f2c5108: Merge "Fix ATLAS_MAP_ENTRY_FIELD_COUNT" into mnc-dev

* commit '7df89722421cf5a954065e9aee7fb3c1ab03c1ee':

commit | commitdiff | tree

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

am 2a79ed9a: am cac798a9: (-s ours) am 6625047a: Merge "BatteryStats: Use English locale for dump and checkin data" into mnc-dev

* commit '2a79ed9a587eac85b864ffc8980ba852d89e5bae':

commit | commitdiff | tree

Nick Kralevich [Thu, 27 Aug 2015 18:13:04 +0000 (18:13 +0000)]

am df98cd73: am 1f2a5665: (-s ours) am 3b0bbd7b: Merge "UsbDeviceManager: fix b/21429947 regression" into mnc-dev

* commit 'df98cd730e2b982c2aa1b68f68e851406688132a':

commit | commitdiff | tree

Chris Wren [Thu, 27 Aug 2015 18:12:52 +0000 (18:12 +0000)]

am b86a311b: am 7888a1bf: (-s ours) am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev

* commit 'b86a311b99a3c2913c5a9e4a2cc9f5e29b78cc02':

commit | commitdiff | tree

Tim Kilbourn [Thu, 27 Aug 2015 18:12:45 +0000 (18:12 +0000)]

am 06d07d7f: am c7229fb1: (-s ours) am 1aadfc2b: Merge "Miss USB device Interface from UsbManager.getDeviceList()." into mnc-dev

* commit '06d07d7f0aa334fac67ab35cee6e5083d8525c06':

commit | commitdiff | tree

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

am 596ff43a: am 803e7512: (-s ours) am 9478bf0e: Merge "Fix handling of RelativeLayout measurement using UNSPECIFIED spec" into mnc-dev

* commit '596ff43ac6b2b52804cdc4ed72dd37138cdbb6c2':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 18:12:28 +0000 (18:12 +0000)]

am d86f36da: am 56bfa513: (-s ours) am 5ef70b02: Merge "Added a note about location permission" into mnc-dev

* commit 'd86f36da1f3c23e0a59855a727fc05d4cb74d5fb':

commit | commitdiff | tree

xin He [Thu, 27 Aug 2015 18:12:21 +0000 (18:12 +0000)]

am a09b5b10: am 89b9831c: (-s ours) am 15a45e02: Merge "Angler Should Not Use Channel 11 for SoftAP" into mnc-dev

* commit 'a09b5b10c1a7a50e30b65153eba20d69b483a1a9':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 18:12:13 +0000 (18:12 +0000)]

am f154d62b: am e5a0e176: (-s ours) am f6e9a3ed: Merge "More info to support CTS, fix reconcile bug." into mnc-dev

* commit 'f154d62b12626fdfafb7bcbde9638ea940d6d8cd':

commit | commitdiff | tree

Jason Monk [Thu, 27 Aug 2015 18:12:03 +0000 (18:12 +0000)]

am 2bcc93c5: am 5669e403: (-s ours) am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev

* commit '2bcc93c5914b371fe0f85a1d6b7b24dc8697fda2':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 18:11:56 +0000 (18:11 +0000)]

am e13dfd24: am e9fdda68: (-s ours) am ac73f1ef: Partially fix that beginning of animation is skipped

* commit 'e13dfd244764000263a5c4807b5a8705081d8419':

commit | commitdiff | tree

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

am 229ffe0c: am eaf3de13: (-s ours) am 6f64e737: Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev

* commit '229ffe0c24f0237392d6366a1cae34e932e8dca7':

commit | commitdiff | tree

Elliott Hughes [Thu, 27 Aug 2015 18:11:39 +0000 (18:11 +0000)]

am bac3cb84: am 0817e208: (-s ours) am f9a82218: am 86d5fc28: Merge "aapt: expat exports its header files now."

* commit 'bac3cb84b83753ed7a048a4935dd5dad19977cc6':

commit | commitdiff | tree

Fred Chung [Thu, 27 Aug 2015 18:11:22 +0000 (18:11 +0000)]

am 86f8dfc0: am f60ecd44: (-s ours) am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs

* commit '86f8dfc02fbdc6a8ddc4e4be68f49008e5f6317a':

commit | commitdiff | tree

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

am a10df1a8: am dd400d6a: (-s ours) am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev

* commit 'a10df1a86806b51a063a76199f1793a641b192e7':

commit | commitdiff | tree

Alex Klyubin [Thu, 27 Aug 2015 18:11:00 +0000 (18:11 +0000)]

am 1da16420: am f6093833: (-s ours) am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev

* commit '1da16420c2af9f591385c4de5a3a1bac955991f7':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 18:10:45 +0000 (18:10 +0000)]

am a6059006: am 5e92327d: (-s ours) am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev

* commit 'a6059006c69147183f9b5c001d89c1c793dfb769':

commit | commitdiff | tree

Kenny Guy [Thu, 27 Aug 2015 18:10:31 +0000 (18:10 +0000)]

am c22f697b: am 8ea8c98a: (-s ours) am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev

* commit 'c22f697bae17a82ceba9c9111afe35e5cd9b8e14':