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

Dan Sandler [Thu, 27 Aug 2015 17:38:45 +0000 (17:38 +0000)]

am b6de88fa: am 45b28129: (-s ours) am 86647987: Icon-related Notifications API changes:

* commit 'b6de88faf5011d7358dfd78130831ac861d3d690':

commit | commitdiff | tree

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

am 79b4150c: am 86c421b4: (-s ours) am 5536bb48: Merge "Fix stuck scrim on keyguard-less devices" into mnc-dev

* commit '79b4150c667231be0b7c6d4e8d9a65d2cd6f314e':

commit | commitdiff | tree

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

am 24edbe02: am 0cad2b60: (-s ours) am 9ba039bb: Merge "Update ChooserTarget constructor to take ComponentName, Bundle" into mnc-dev

* commit '24edbe024b3370d2b7abd3a7ee008b5bcd658258':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 17:37:46 +0000 (17:37 +0000)]

am e508d867: am 2264842f: (-s ours) am 6f561a24: Merge "Improve documentation of onRequestPermissionsResult" into mnc-dev

* commit 'e508d867e3cfd285dc996644c983093afc9bdd32':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 17:37:35 +0000 (17:37 +0000)]

am 504e699a: am d352bb55: (-s ours) am 5aff3b54: Merge "Maintain call time across SRVCC (2/3)." into mnc-dev

* commit '504e699a59f1432c43ccf3af685a0557922824f0':

commit | commitdiff | tree

Alex Klyubin [Thu, 27 Aug 2015 17:37:25 +0000 (17:37 +0000)]

am 75efd80b: am 3ddc42fe: (-s ours) am f7592b23: Merge "HMAC keys are authorized for exactly one digest." into mnc-dev

* commit '75efd80b2b15ac693d1693c495a3d728839b1376':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 17:37:18 +0000 (17:37 +0000)]

am 2bab9d74: am f10d7708: (-s ours) am d4b566bf: Merge "Add APIs for verifier to grant at install and revoke permissions" into mnc-dev

* commit '2bab9d74f5d1fef179b250630fec837d0d9e9ac0':

commit | commitdiff | tree

Chris Craik [Thu, 27 Aug 2015 17:37:10 +0000 (17:37 +0000)]

am e018d8be: am cb778a8e: (-s ours) am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev

* commit 'e018d8be73858039aa2d229873102d609da2e649':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:36:57 +0000 (17:36 +0000)]

am 13184037: am 628d4653: (-s ours) am aaee5b53: Merge "Work on issue #22516282: ChooserTarget URI grants not forwarded" into mnc-dev

* commit '131840372a1bb2dd305be625dcb07ebdf35e4ca7':

commit | commitdiff | tree

Makoto Onuki [Thu, 27 Aug 2015 17:36:45 +0000 (17:36 +0000)]

am dbf8c417: am 890e3064: (-s ours) am b09b84ca: Merge "DefaultPermission: GET_ACCOUNTS is now in CONTACTS" into mnc-dev

* commit 'dbf8c417ce56540e9a12443f13abbadadea51100':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 17:36:28 +0000 (17:36 +0000)]

am 040081b1: am f1be0792: (-s ours) am db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev

* commit '040081b1c2e267054e1f19aefeb6a75df671b8b9':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 17:35:59 +0000 (17:35 +0000)]

am 38f61814: am d8a869cb: (-s ours) am 081649c2: am f4db2de8: am 1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs

* commit '38f61814f114503ab8bc9a8487ba867b814a7121':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:35:39 +0000 (17:35 +0000)]

am eda87980: am cf5375d8: (-s ours) am 8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev

* commit 'eda87980f671057a414d0e21efc60bc9235d8984':

commit | commitdiff | tree

Miao Wang [Thu, 27 Aug 2015 17:35:21 +0000 (17:35 +0000)]

am bf206804: am 588f5739: (-s ours) am d96243a1: am 10653cef: Merge "fix BNNM docs"

* commit 'bf206804de541f20e4cfac9ff40f21ff29c5fe60':

commit | commitdiff | tree

Todd Kennedy [Thu, 27 Aug 2015 17:35:04 +0000 (17:35 +0000)]

am 012956b0: am ff4b10d3: (-s ours) am a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev

* commit '012956b0feebedd11410556268ba2dac7d4688ac':

commit | commitdiff | tree

Wale Ogunwale [Thu, 27 Aug 2015 17:34:56 +0000 (17:34 +0000)]

am adc2e039: am fde33da1: (-s ours) am 11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev

* commit 'adc2e039ec17e1f07faf706f91ff69870585da89':

commit | commitdiff | tree

John Reck [Thu, 27 Aug 2015 17:34:45 +0000 (17:34 +0000)]

am 840af451: am 7e560444: (-s ours) am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev

* commit '840af451e502ba1d83da0a3a4fc4d593eaf63a9c':

commit | commitdiff | tree

Tony Mak [Thu, 27 Aug 2015 17:34:30 +0000 (17:34 +0000)]

am b9510506: am e90017d9: (-s ours) am 532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev

* commit 'b95105065015686cc11870ee5e95493896915a49':

commit | commitdiff | tree

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

am 8848786f: am 5fb324ad: (-s ours) am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev

* commit '8848786fbbc0895a313187dc17a6c1f24be7891f':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 17:33:34 +0000 (17:33 +0000)]

am 8a422246: am 7f35b0d2: (-s ours) am 30c8245a: Merge "Add data binding to built javadoc." into mnc-dev

* commit '8a42224620b30941415b527145051e04a62a5635':

commit | commitdiff | tree

Nicolas Prevot [Thu, 27 Aug 2015 17:32:45 +0000 (17:32 +0000)]

am 79ec2b20: am 0f2b3abf: (-s ours) am dbdf7c45: Don\'t send app links to the parent if status = never (part 2)

* commit '79ec2b2033e2f3132bca911b7ced0bf14b02caf0':

commit | commitdiff | tree

Neil Fuller [Thu, 27 Aug 2015 17:31:53 +0000 (17:31 +0000)]

am 01f9e8fe: am 2b5dfb97: (-s ours) am 98f3d953: am eccbc7c9: Merge "Fix NativeCrashListener"

* commit '01f9e8fec0ce586be0dc4cd26d2680f5d6347353':

commit | commitdiff | tree

Narayan Kamath [Thu, 27 Aug 2015 17:31:18 +0000 (17:31 +0000)]

am f83861ce: am 95b869e2: (-s ours) am 737106a6: am 1ecfdf33: Merge "docs: Add an explicit dependency on libcore/Docs.mk"

* commit 'f83861ce237416a25c787b76d34006360a871e8d':

commit | commitdiff | tree

Vineeta Srivastava [Thu, 27 Aug 2015 17:30:52 +0000 (17:30 +0000)]

am 5ab5dd6e: am d56efb48: (-s ours) am 47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev

* commit '5ab5dd6e9df4081e65fa09accbf09acee34a0648':

commit | commitdiff | tree

Sanket Padawe [Thu, 27 Aug 2015 17:30:31 +0000 (17:30 +0000)]

am cc0ddfc3: am 152c2e9a: (-s ours) am ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev

* commit 'cc0ddfc39f40d0489bcd4f51c87d14db4d0b71eb':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 17:29:50 +0000 (17:29 +0000)]

am 2ae322d3: am 979939ef: (-s ours) am c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev

* commit '2ae322d367b47458bb8b582598c4b2217854046b':

commit | commitdiff | tree

Yohei Yukawa [Thu, 27 Aug 2015 17:28:54 +0000 (17:28 +0000)]

am 872d03e9: am a0d9be5a: (-s ours) am ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev

* commit '872d03e915ed06424afd560417f7502429c75b2a':

commit | commitdiff | tree

Chris Tate [Thu, 27 Aug 2015 17:28:03 +0000 (17:28 +0000)]

am 712d8bed: am 3ad2f45b: (-s ours) am a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev

* commit '712d8bed243f42d70c228bfbe4a6fc430123e2b5':

commit | commitdiff | tree

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

am e4784e77: am 6a10b84b: (-s ours) am a8455147: (-s ours) am 2fccb66d: Merge "Fix a bug disappearing installerPackageName info of packages after reboot."

* commit 'e4784e77508ec45e6c2c04fce9a432024bc8007a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 17:26:45 +0000 (17:26 +0000)]

am 4d6d977e: am 03727c2f: (-s ours) am a6ad75fb: Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev

* commit '4d6d977ef73f283a67867da6967c29e8d170144a':

commit | commitdiff | tree

Deepanshu Gupta [Thu, 27 Aug 2015 17:26:23 +0000 (17:26 +0000)]

am 8bec070c: am adb63087: (-s ours) am 43286266: Merge "Change tools:list_item to listitem." into mnc-dev

* commit '8bec070c40b518f118ed1596780e5fceefc1d1ae':

commit | commitdiff | tree

Robert Schaub [Thu, 27 Aug 2015 17:26:00 +0000 (17:26 +0000)]

am 8db5cf67: am ad4f73ef: (-s ours) am a73face3: am 8c5f34de: am b53568f2: docs: Added word "video" to tv app quality guidelines.

* commit '8db5cf67485ca0d0a82e6a66e97d4794d7f3955f':

commit | commitdiff | tree

Jun Mukai [Thu, 27 Aug 2015 17:25:30 +0000 (17:25 +0000)]

am f85b20df: am bce08880: (-s ours) am 8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev

* commit 'f85b20df37076fd6ba05453a2b3997f19f2d90d6':

commit | commitdiff | tree

Oren Blasberg [Thu, 27 Aug 2015 17:24:47 +0000 (17:24 +0000)]

am 411f6608: am 3812cfb8: (-s ours) am 84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev

* commit '411f66082f55c290efab3eda6ee599f17eed9f3a':

commit | commitdiff | tree

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

am d5cb85c2: am d83f4acc: (-s ours) am fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev

* commit 'd5cb85c29be4b496d65c15f655c6d9bc7f7711ba':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 17:23:57 +0000 (17:23 +0000)]

am ac5c6358: am c01d80c3: (-s ours) am 3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev

* commit 'ac5c6358ffd4487efe85bb6bb144fdf3ce7d72ba':

commit | commitdiff | tree

Billy Lau [Thu, 27 Aug 2015 17:23:41 +0000 (17:23 +0000)]

am 54ae6d2a: am 1db9717a: (-s ours) am 008409a2: Merge "Bug: 21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev

* commit '54ae6d2a8346ea673899961f49509d329b65f6f3':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:23:26 +0000 (17:23 +0000)]

am f74062a9: am e13f9e41: (-s ours) am f6586cbd: Merge "Implement issue #22403908: Enable assistant to refuse context sharing" into mnc-dev

* commit 'f74062a94c3cdbb74c5d25824a76f0901f99a890':

commit | commitdiff | tree

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

am 7feb3bab: am b742acaa: (-s ours) am 67e02e60: Merge "Fix issue #22487155: Device unresponsive (deadlock in system_server)" into mnc-dev

* commit '7feb3bab06da3de726c019db00e4692c73d41981':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:22:46 +0000 (17:22 +0000)]

am 514154e4: am cc8555bf: (-s ours) am c4e2bcd4: Merge "Fix issue #22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev

* commit '514154e4481c1ea2fde148d6a8ed9263271f30ed':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:22:10 +0000 (17:22 +0000)]

am 9a24ac2f: am 10442514: (-s ours) am c1a49b50: Merge "Fix issue #22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev

* commit '9a24ac2f26d95f90e43f44c3fe36554baf4a2853':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:21:39 +0000 (17:21 +0000)]

am 28144c34: am 190b8470: (-s ours) am 1cf8b0b6: Merge "Fix issue #22124996: VI: Command Request not Active" into mnc-dev

* commit '28144c343110bcd53c66536fe4ae0acda45e6279':

commit | commitdiff | tree

Svetoslav [Thu, 27 Aug 2015 17:21:22 +0000 (17:21 +0000)]

am 822df7f0: am 4b27514e: (-s ours) am 08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev

* commit '822df7f0a5514078f2240173546661c620068887':

commit | commitdiff | tree

Christopher Tate [Thu, 27 Aug 2015 17:21:06 +0000 (17:21 +0000)]

am ddcfa831: am df263ee8: (-s ours) am 06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev

* commit 'ddcfa83112f4e1dcdd467587110174f3803d7f5b':

commit | commitdiff | tree

Abodunrinwa Toki [Thu, 27 Aug 2015 17:20:51 +0000 (17:20 +0000)]

am 10b9e88d: am 5db78381: (-s ours) am 6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev

* commit '10b9e88da37dcf02ae7f3cf5484de2a658c7091f':

commit | commitdiff | tree

Miao Wang [Thu, 27 Aug 2015 17:20:35 +0000 (17:20 +0000)]

am ad2c5e96: am 9ee3b6f1: (-s ours) am ad904cf3: Merge "fix BNNM docs" into mnc-dev

* commit 'ad2c5e968866e8a6fdbaf3b8ad796d053c084af7':

commit | commitdiff | tree

Svet Ganov [Thu, 27 Aug 2015 17:20:18 +0000 (17:20 +0000)]

am c79e23b1: am 7a14c11d: (-s ours) am 75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev

* commit 'c79e23b177cbcfa9302c25b1cf01c9033e6ff80e':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 17:19:55 +0000 (17:19 +0000)]

am c0fc3075: (-s ours) am 40c0d8c8: (-s ours) am 78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'c0fc307593fa512da28314c2a7ce682a525d5956':

commit | commitdiff | tree

Adrian Roos [Thu, 27 Aug 2015 17:19:35 +0000 (17:19 +0000)]

am a03e6b6e: am 5cdeb956: (-s ours) am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

* commit 'a03e6b6e0626845b0d544ed89677465b1af9cf5d':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 17:19:20 +0000 (17:19 +0000)]

am 58463380: (-s ours) am a437a516: (-s ours) am 4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '58463380157c4d3796cf13f6564ab536e96f4cb0':

commit | commitdiff | tree

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

am a654d946: (-s ours) am fd184821: (-s ours) am 197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'a654d94661316056ebc60032d4ec4c4a15cd3399':

commit | commitdiff | tree

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

am 5699634c: (-s ours) am bf833850: (-s ours) am 6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '5699634c5662ddbe1cae332a9bd7c5200d36c5fe':

commit | commitdiff | tree

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

am 94812627: (-s ours) am 3d345916: (-s ours) am a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9481262762e7708d77e67119d1774a2544215a5d':

commit | commitdiff | tree

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

am cdf0af43: (-s ours) am 913f9a31: (-s ours) am ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'cdf0af43e2db45caddb267101df305144ff1771b':

commit | commitdiff | tree

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

am 0cb2f2a9: (-s ours) am 7550c53d: (-s ours) am 36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0cb2f2a9796474ed305af5bd9d72285fc01417d9':

commit | commitdiff | tree

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

am 9608d29d: (-s ours) am f28f62fe: (-s ours) am e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '9608d29d07e0b87a0e60b21e1e08ca7346426e47':

commit | commitdiff | tree

Jorim Jaggi [Thu, 27 Aug 2015 17:18:08 +0000 (17:18 +0000)]

am 6ba61f1c: am 897d0ff2: (-s ours) am eea8be53: Adjust assist disclosure stroke width to spec

* commit '6ba61f1cda61e841510fc3e249e60fb0295e0ce8':

commit | commitdiff | tree

Roshan Pius [Thu, 27 Aug 2015 17:18:00 +0000 (17:18 +0000)]

am 03544413: am 9a077502: (-s ours) am 4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev

* commit '03544413847febafe864b380ea5e4929778705b8':

commit | commitdiff | tree

Felipe Leme [Thu, 27 Aug 2015 17:17:52 +0000 (17:17 +0000)]

am 0b9ffdf2: am 69a5b4f4: (-s ours) am 68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev

* commit '0b9ffdf2fb444e8729206ee9ffad8b8050f3b7d0':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:17:31 +0000 (17:17 +0000)]

am bd3d81d1: am a9f27f03: (-s ours) am d193916c: Merge "Fix build." into mnc-dev

* commit 'bd3d81d1ca86b6570fc27fe0496161b2cf8678e7':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 17:17:08 +0000 (17:17 +0000)]

am 49a28ec9: am 726c4d27: (-s ours) am 76c4c666: Add USB port manager.

* commit '49a28ec97622ec5cb6b88d867d949ed78253e952':

commit | commitdiff | tree

Jeff Brown [Thu, 27 Aug 2015 17:16:42 +0000 (17:16 +0000)]

am c7adfb1d: am 0c779818: (-s ours) am 2dbccc19: Clean up USB Manager dump.

* commit 'c7adfb1d6858409e77a3ba6743aad48c345c8cce':

commit | commitdiff | tree

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

am 631c7358: am ddde2ac3: (-s ours) am 539f7ac7: Merge "Give DCS permission needed to measure all users." into mnc-dev

* commit '631c735839a4db988d836435ca77f7ed3691c5f7':

commit | commitdiff | tree

Jeff Sharkey [Thu, 27 Aug 2015 17:16:18 +0000 (17:16 +0000)]

am 13fd6114: am 02e19d08: (-s ours) am 483bd842: Merge "Only send EXTRA_STACK for private intent." into mnc-dev

* commit '13fd611463626465746146f1d32e0caa3828eff8':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:16:10 +0000 (17:16 +0000)]

am 15e23378: am e6325869: (-s ours) am 1d4247c4: Merge "Improve tracking of screen on reasons." into mnc-dev

* commit '15e233785af8125dea78e540fb74d55c8c46daee':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 17:15:56 +0000 (17:15 +0000)]

am 27282d8a: (-s ours) am 5cb32edb: (-s ours) am facfbc52: (-s ours) Import translations. DO NOT MERGE

* commit '27282d8a01fcd9959df7c277eadce92f630ba205':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 17:15:24 +0000 (17:15 +0000)]

am ac67a547: (-s ours) am 0c1ee954: (-s ours) am b4ac0141: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'ac67a547a5bc5ff97ba4c9937c51edf0651c58ed':

commit | commitdiff | tree

George Mount [Thu, 27 Aug 2015 17:14:25 +0000 (17:14 +0000)]

am 96e500fc: am 1a9e0c95: (-s ours) am 503ad9ee: Merge "Fix input pause without resume." into mnc-dev

* commit '96e500fca15adee44ff7e8a2912c699a44389153':

commit | commitdiff | tree

Geoff Mendal [Thu, 27 Aug 2015 17:13:33 +0000 (17:13 +0000)]

am bbdd0fcd: (-s ours) am d0af481e: (-s ours) am 94666b76: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit 'bbdd0fcdabe4fdfc4f1ba5aa926a5cd817703664':

commit | commitdiff | tree

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

am 68ba853e: (-s ours) am 30e1781a: (-s ours) am 57d8be8b: (-s ours) Import translations. DO NOT MERGE

* commit '68ba853ec8319c4af177e3d73d4a1a904dbe0424':

commit | commitdiff | tree

Adam Powell [Thu, 27 Aug 2015 17:11:58 +0000 (17:11 +0000)]

am 273e3c75: am 12afd29b: (-s ours) am 18709f9a: Merge "Relax strict ActionMode instance checking when finishing action modes" into mnc-dev

* commit '273e3c753c6725dba9775617cba3b159a550ff72':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:11:25 +0000 (17:11 +0000)]

am 57a9be94: am 9a24cd71: (-s ours) am 63461e61: Merge "Bump mms whitelist time up to 1 minute." into mnc-dev

* commit '57a9be9416776adad239a0d58ef9f2a9a726747e':

commit | commitdiff | tree

Dianne Hackborn [Thu, 27 Aug 2015 17:10:48 +0000 (17:10 +0000)]

am 150e3946: am 63cb6c42: (-s ours) am f1f8b9cc: Merge "Fix issue #21626564: MMS should be receivied while Dozing" into mnc-dev

* commit '150e394691766d594d5f5451a41973af7375dab6':

commit | commitdiff | tree

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

am 1c52d98d: am 45296bab: (-s ours) am 4044440d: Merge "Require ACCESS_COARSE_LOCATION for ACTION_FOUND broadcast" into mnc-dev

* commit '1c52d98d61b3f2ff481a3641243c33edbd0c3b7d':

commit | commitdiff | tree

Eric Laurent [Thu, 27 Aug 2015 17:08:53 +0000 (17:08 +0000)]

am 45a82d76: am 336fde34: (-s ours) am bd874b8b: Merge "AudioManager: fix audio device callback list access" into mnc-dev

* commit '45a82d76950aca44723e2cee2b8f50cd8f82ddfb':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 17:08:06 +0000 (17:08 +0000)]

am 03c2309b: am 29e8318c: (-s ours) am 98724126: Merge "Added sendBroadcastMultiplePermissions method" into mnc-dev

* commit '03c2309b1eb5f75fdce6120427b5812a9f4b6542':

commit | commitdiff | tree

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

am 2091cc5f: am 9fcdb936: (-s ours) am 267240f2: Merge "BatteryStats: Clear power use when removing a UID from uid_cputime kernel module" into mnc-dev

* commit '2091cc5f71d23f0ab7aa2401c7a5bd361b875f85':

commit | commitdiff | tree

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

am 2ea12a8f: am 72984da9: (-s ours) am 56d82dd2: BatteryStats: Fix deadlock

* commit '2ea12a8ffa015f2d00466ef7427847934c393c45':

commit | commitdiff | tree

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

am 57d28033: am 5e9e64c0: (-s ours) am d4c1861a: Merge "BatteryStats: Fix units in wakelock distribution calculation" into mnc-dev

* commit '57d28033dd0ae2cddf21d15b5a627a927f796a71':

commit | commitdiff | tree

Yin-Chia Yeh [Thu, 27 Aug 2015 17:05:40 +0000 (17:05 +0000)]

am 53841ec2: am d823b013: (-s ours) am b42cb352: Merge "Camera: clarify largest JPEG dimension expectation" into mnc-dev

* commit '53841ec2186ffa6f2b2352d10a21016f656956dc':

commit | commitdiff | tree

Fyodor Kupolov [Thu, 27 Aug 2015 17:05:26 +0000 (17:05 +0000)]

am 94117647: am 17e97b00: (-s ours) am 4a817924: Merge "Revert "Allow array of required permissions in sendBroadcast"" into mnc-dev

* commit '941176471f50fbf88b9afb30fe0272bd2bf063b7':

commit | commitdiff | tree

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