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

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

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