OSDN Git Service

android-x86/frameworks-base.git
9 years agoam ae1f02b4: am f1a6feb9: am 1c44c24b: am d4540672: am 30a5e35b: Merge "Apply cross...
Amith Yamasani [Fri, 19 Sep 2014 04:34:22 +0000 (04:34 +0000)]
am ae1f02b4: am f1a6feb9: am 1c44c24b: am d4540672: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev

* commit 'ae1f02b463715f4e9efb42c4300675cdf1800150':

9 years agoam b86bdd87: am ff62fd03: am a26e2620: am 5b06de07: am 8738c8db: Merge "Bring back...
ztenghui [Fri, 19 Sep 2014 04:34:18 +0000 (04:34 +0000)]
am b86bdd87: am ff62fd03: am a26e2620: am 5b06de07: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev

* commit 'b86bdd87b86a9fd4c9aa53527f95b54301e48720':

9 years agoam f7362193: am fafefc32: am f0d61240: am 57b58b03: am e1264a88: Merge "Re-triangulat...
ztenghui [Fri, 19 Sep 2014 04:34:14 +0000 (04:34 +0000)]
am f7362193: am fafefc32: am f0d61240: am 57b58b03: am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev

* commit 'f7362193a35f998943893426de02e518a5dbca0e':

9 years agoam b1d3ef4e: am 03be308c: am 11e11b97: am 0c9aa9cf: am 8c57b9e9: Merge "More android...
Jean-Michel Trivi [Fri, 19 Sep 2014 04:34:09 +0000 (04:34 +0000)]
am b1d3ef4e: am 03be308c: am 11e11b97: am 0c9aa9cf: am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev

* commit 'b1d3ef4e23b7584e97a60128836d04ad17b48085':

9 years agoam 1be4b335: am 1d552bcb: am 01ae2224: am 82f0d91a: am e667e41b: Merge "Bugfix: use...
Alexandra Gherghina [Fri, 19 Sep 2014 04:34:05 +0000 (04:34 +0000)]
am 1be4b335: am 1d552bcb: am 01ae2224: am 82f0d91a: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev

* commit '1be4b33566549d2ea05ece2c2bea20a7925281f2':

9 years agoam 32080ef3: am 01e665c3: am 0250b98a: am def1eade: am b0a86a06: Merge "Replace TreeS...
Przemyslaw Szczepaniak [Fri, 19 Sep 2014 04:34:01 +0000 (04:34 +0000)]
am 32080ef3: am 01e665c3: am 0250b98a: am def1eade: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev

* commit '32080ef3ba07b2dbafe338ce9509fc1e6413c972':

9 years agoam 7d61c0de: am d281139c: am 0518e3a5: am 6d0417db: am 1ca196bb: Merge "Omit appearin...
George Mount [Fri, 19 Sep 2014 04:33:57 +0000 (04:33 +0000)]
am 7d61c0de: am d281139c: am 0518e3a5: am 6d0417db: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev

* commit '7d61c0de0bf6a8cec4373c5678d4a4dd088eaae5':

9 years agoam 77634941: am 630d37a4: am b6603c8f: am c82b401e: am 086bf8e1: Merge "Allow device...
Julia Reynolds [Fri, 19 Sep 2014 04:33:52 +0000 (04:33 +0000)]
am 77634941: am 630d37a4: am b6603c8f: am c82b401e: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev

* commit '7763494109aca35a3ea8c6a99c1f6b3548669e9d':

9 years agoam 145aca2e: am 18c92caf: am 664bf410: am 0fdbbb56: am 293e5007: Merge "Enrich test...
Yohei Yukawa [Fri, 19 Sep 2014 04:33:47 +0000 (04:33 +0000)]
am 145aca2e: am 18c92caf: am 664bf410: am 0fdbbb56: am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev

* commit '145aca2ead74d42b1c78c14d48eca3983f99e610':

9 years agoam 6ca03c54: (-s ours) am 0dace1ea: (-s ours) am 0dcb713d: (-s ours) am 837003f4...
Baligh Uddin [Fri, 19 Sep 2014 04:33:42 +0000 (04:33 +0000)]
am 6ca03c54: (-s ours) am 0dace1ea: (-s ours) am 0dcb713d: (-s ours) am 837003f4: (-s ours) am 77522e51: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6ca03c5494a1fdbb5926ad93fddc5f37cfa29f84':

9 years agoam 6a60a538: (-s ours) am f27d2fc7: (-s ours) am a89143b2: (-s ours) am a5ebdc74...
Baligh Uddin [Fri, 19 Sep 2014 04:33:38 +0000 (04:33 +0000)]
am 6a60a538: (-s ours) am f27d2fc7: (-s ours) am a89143b2: (-s ours) am a5ebdc74: (-s ours) am efef3133: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '6a60a53823a79e8103c4753276b44017be9b0091':

9 years agoam 9e9cb8e2: am 0d7ba037: am dbbb45fa: am 75aeed1c: am b04106ed: Merge "Remove packag...
Alexandra Gherghina [Fri, 19 Sep 2014 04:33:33 +0000 (04:33 +0000)]
am 9e9cb8e2: am 0d7ba037: am dbbb45fa: am 75aeed1c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev

* commit '9e9cb8e2d955ff3cfa6a7c79b2a81d0c8f7fcf9e':

9 years agoam 19300826: am 3ffd9c34: am 91a7a5f5: am e48df1a5: am 163c3d9a: Merge "Enrich test...
Yohei Yukawa [Fri, 19 Sep 2014 04:33:28 +0000 (04:33 +0000)]
am 19300826: am 3ffd9c34: am 91a7a5f5: am e48df1a5: am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev

* commit '19300826f0aafbd1699054185b6ab485a36c0023':

9 years agoam 0a548d1b: am f9897133: am 056d3a7f: am 765f98cc: am c1dad5c2: Merge "Flush HTTP...
Paul Jensen [Fri, 19 Sep 2014 04:33:24 +0000 (04:33 +0000)]
am 0a548d1b: am f9897133: am 056d3a7f: am 765f98cc: am c1dad5c2: Merge "Flush HTTP socket pools and DNS cache when binding process to a Network." into lmp-dev

* commit '0a548d1bb73263d83579914abe9f6514b25475df':

9 years agoam 26d56905: am 8c154b47: am 07c1084c: am 3d9eb022: am 7f1343ee: Merge "Make Network...
Paul Jensen [Fri, 19 Sep 2014 04:33:19 +0000 (04:33 +0000)]
am 26d56905: am 8c154b47: am 07c1084c: am 3d9eb022: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev

* commit '26d569059c21565e7d40f79bbc9bd4a7baf24a95':

9 years agoam f62ae956: am 7a48aaea: am 593f6c29: am 5148c772: am 840b03de: Merge "Don\'t use...
Jorim Jaggi [Fri, 19 Sep 2014 04:33:13 +0000 (04:33 +0000)]
am f62ae956: am 7a48aaea: am 593f6c29: am 5148c772: am 840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev

* commit 'f62ae9567564e7e4bc25beca943e3253de276dfc':

9 years agoam 6000d899: am 742498c2: am 08bb1449: am c0f4567f: am 7a094593: Merge "Fix inconsist...
Jorim Jaggi [Fri, 19 Sep 2014 04:33:09 +0000 (04:33 +0000)]
am 6000d899: am 742498c2: am 08bb1449: am c0f4567f: am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev

* commit '6000d899a9c74da9b55941ed27370a7bd4936305':

9 years agoam 4003be21: am 1305039b: am 18bf1854: am baa3f815: am 2b304948: Merge "Fixed a crash...
Selim Cinek [Fri, 19 Sep 2014 04:33:04 +0000 (04:33 +0000)]
am 4003be21: am 1305039b: am 18bf1854: am baa3f815: am 2b304948: Merge "Fixed a crash when the more card or the dismissview was longpressed" into lmp-dev

* commit '4003be214135f36506259057e234359f81bff3e2':

9 years agoam a466372b: am 0b2b9037: am 16a7b742: am a148f057: am 31ffc0d6: Merge "Fixed a bug...
Selim Cinek [Fri, 19 Sep 2014 04:32:59 +0000 (04:32 +0000)]
am a466372b: am 0b2b9037: am 16a7b742: am a148f057: am 31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev

* commit 'a466372b660dc48898e94e8d3d5ff0e168b67c88':

9 years agoam 9f692f47: am f0dda077: am bba726ee: am f71a1a16: am e4de3fbe: Merge "Fixed a bug...
Selim Cinek [Fri, 19 Sep 2014 04:32:45 +0000 (04:32 +0000)]
am 9f692f47: am f0dda077: am bba726ee: am f71a1a16: am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev

* commit '9f692f474954d7e4faca9c2269a2c21b83961a8d':

9 years agoam 4440a607: am 84506815: am a0b6ea64: am 7e16a563: am db19c5af: Merge "Fix: always...
Nicolas Prevot [Fri, 19 Sep 2014 04:32:40 +0000 (04:32 +0000)]
am 4440a607: am 84506815: am a0b6ea64: am 7e16a563: am db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev

* commit '4440a607d047f68416f7bfeec41b78b7348f557d':

9 years agoam f8ee4f27: am 621a980b: am c270e926: am decf7f1e: am 92701395: Merge "Enrich test...
Yohei Yukawa [Fri, 19 Sep 2014 04:32:36 +0000 (04:32 +0000)]
am f8ee4f27: am 621a980b: am c270e926: am decf7f1e: am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev

* commit 'f8ee4f276ec7d0d37869e9dfab7f3d730e428b54':

9 years agoam fc2ec9b2: am 82af688c: am dd59cd66: am 3a230576: am 4c8c7591: Merge "Update the...
Derek Tan [Fri, 19 Sep 2014 04:32:31 +0000 (04:32 +0000)]
am fc2ec9b2: am 82af688c: am dd59cd66: am 3a230576: am 4c8c7591: Merge "Update the comment in two APIs since we will persist the settings." into lmp-dev

* commit 'fc2ec9b259839b3a2dadc607fc0f2ad8eaa66130':

9 years agoam 5e0778fd: am 98a549ff: am c94d048e: am 2c3cfb90: am 8d89d1e0: Merge "LayoutLib...
Deepanshu Gupta [Fri, 19 Sep 2014 04:32:26 +0000 (04:32 +0000)]
am 5e0778fd: am 98a549ff: am c94d048e: am 2c3cfb90: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev

* commit '5e0778fd33d1862a2209e6b0d40a05d3c6ac4d3b':

9 years agoam c670ad3e: am a29670ef: am 2b61a03d: am 930795c0: am a20c82b9: am e5c53e9d: am...
Jean-Michel Trivi [Fri, 19 Sep 2014 04:32:20 +0000 (04:32 +0000)]
am c670ad3e: am a29670ef: am 2b61a03d: am 930795c0: am a20c82b9: am e5c53e9d: am 4fa904ab: am 9513f81e: am 24499ba7: am e1f07060: (-s ours) am e825f0ee: am 60f22fbf: Do not restore the media button event receiver

* commit 'c670ad3e19bd4cf907a583de9e5386b8f4b75420':

9 years agoam d980505e: am d8386569: am 1aad2ee1: am 37dbbe0d: am bb79fcb8: am 6c7bc371: am...
Ricardo Cervera [Fri, 19 Sep 2014 04:32:16 +0000 (04:32 +0000)]
am d980505e: am d8386569: am 1aad2ee1: am 37dbbe0d: am bb79fcb8: am 6c7bc371: am 4232a59b: am d086db30: Merge "cherrypick from klp-modular-dev docs: Added note on disabling debugging for WebView apps. Bug: 16232761 Change-Id: I6cdc2ef7da87e78ec42a456d232a8e46a26c7365"

* commit 'd980505eba810906fb643366f635b53846e80adc':

9 years agoam 6b085939: am d9e2247b: am ca2febd4: am d7ba3364: am ce068304: am 4bb4d66c: am...
Ricardo Cervera [Fri, 19 Sep 2014 04:32:11 +0000 (04:32 +0000)]
am 6b085939: am d9e2247b: am ca2febd4: am d7ba3364: am ce068304: am 4bb4d66c: am 02afa734: am a6c12f01: Merge "docs: Fixed minor bug in downloads class. Bug: 16948533" into klp-modular-docs

* commit '6b08593974d820e5a074dc61b28d06cf58280314':

9 years agoam 5b20c298: am 9d884704: am 06cb29ce: am 95f093cb: am 4608b9d9: Fix build breakage
Youngsang Cho [Fri, 19 Sep 2014 04:32:06 +0000 (04:32 +0000)]
am 5b20c298: am 9d884704: am 06cb29ce: am 95f093cb: am 4608b9d9: Fix build breakage

* commit '5b20c298c9d94572dd6de09bef4f408e2f695ffd':

9 years agoam 2921c1e2: am 232b724f: am 99827bb4: am 5b915753: am 75cd6c5e: Merge "Add a system...
Terry Heo [Fri, 19 Sep 2014 04:32:02 +0000 (04:32 +0000)]
am 2921c1e2: am 232b724f: am 99827bb4: am 5b915753: am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev

* commit '2921c1e24937b08020bd593096753760172409fc':

9 years agoam 8a087253: am c5d7a8ed: am 221a3d05: am 2e2422ec: am cacba761: Notify of the update...
Chulwoo Lee [Fri, 19 Sep 2014 04:31:58 +0000 (04:31 +0000)]
am 8a087253: am c5d7a8ed: am 221a3d05: am 2e2422ec: am cacba761: Notify of the update of TvInputInfo

* commit '8a0872530043c767a6f3cb901e3f94fc1aee4f03':

9 years agoam 3920c6f6: am d04618e2: am fd7e8b2e: am d834fa99: am 515699a4: Merge "Use Calendar...
Alan Viverette [Fri, 19 Sep 2014 04:31:54 +0000 (04:31 +0000)]
am 3920c6f6: am d04618e2: am fd7e8b2e: am d834fa99: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev

* commit '3920c6f69edbd82733a99e8a8670d0210412dac0':

9 years agoam 33e168ce: am cc50af38: am e1e2a579: am 96ae7282: am f0ccea92: Merge "Using the...
Svetoslav Ganov [Fri, 19 Sep 2014 04:31:46 +0000 (04:31 +0000)]
am 33e168ce: am cc50af38: am e1e2a579: am 96ae7282: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev

* commit '33e168ceec4476ec7b018910a866e43f9dcdc168':

9 years agoam 9fd72e01: am 43d85b50: am 0403c6ef: am 4032fbdc: am c4c153a8: MediaCodec.Image...
Lajos Molnar [Fri, 19 Sep 2014 04:31:38 +0000 (04:31 +0000)]
am 9fd72e01: am 43d85b50: am 0403c6ef: am 4032fbdc: am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor

* commit '9fd72e0188122a9d294ba837bc2936c745ae6951':

9 years agoam b21ff231: am ab21b72f: am aad459f4: am bc3eadca: am 022cfcda: Merge "Fix issue...
Dianne Hackborn [Fri, 19 Sep 2014 04:31:31 +0000 (04:31 +0000)]
am b21ff231: am ab21b72f: am aad459f4: am bc3eadca: am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev

* commit 'b21ff231d1b64285602a0866c72a0cf436831689':

9 years agoam d550e905: am 82603d51: am e2ca8be1: am 26ed2b70: am b4ee4428: Merge "Fix issue...
Dianne Hackborn [Fri, 19 Sep 2014 04:31:24 +0000 (04:31 +0000)]
am d550e905: am 82603d51: am e2ca8be1: am 26ed2b70: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev

* commit 'd550e905642becfb74e9d15eb2b58055233b9129':

9 years agoam 8a5c678b: am 389307ba: am 2592bd88: am f0c11830: am 3b22910c: Merge "add android...
Lajos Molnar [Fri, 19 Sep 2014 04:31:19 +0000 (04:31 +0000)]
am 8a5c678b: am 389307ba: am 2592bd88: am f0c11830: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev

* commit '8a5c678bed7e99905d3d94de4ad146c4fccbe053':

9 years agoam 019caa7c: am 732fd044: am d44b17fe: am 713a0555: am 5acd2166: Merge "Output recent...
Adam Lesinski [Fri, 19 Sep 2014 04:31:15 +0000 (04:31 +0000)]
am 019caa7c: am 732fd044: am d44b17fe: am 713a0555: am 5acd2166: Merge "Output recent configs in am get-config command" into lmp-dev

* commit '019caa7ce3ab9a3eefb661832394abbe93eb1512':

9 years agoam 9e70dfe3: am f663e0fc: am d77a20d7: am 46751736: am 2a94c34d: Merge "Copy opaque...
Alan Viverette [Fri, 19 Sep 2014 04:31:11 +0000 (04:31 +0000)]
am 9e70dfe3: am f663e0fc: am d77a20d7: am 46751736: am 2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev

* commit '9e70dfe30869be2cc719b18233300e79583ccde4':

9 years agoam de188fad: am fd8d3d3b: am a8416451: am 74361162: am 78f863c7: Merge "Fix docs...
Alan Viverette [Fri, 19 Sep 2014 04:31:06 +0000 (04:31 +0000)]
am de188fad: am fd8d3d3b: am a8416451: am 74361162: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev

* commit 'de188fad17a5028770bc48a4a83f1ef63998bbf8':

9 years agoam e4e3bbed: am 8f0d51ac: am 179c15b5: am 70eb8e2e: am 8b5ef83e: Merge "Make SearchVi...
Alan Viverette [Fri, 19 Sep 2014 04:31:01 +0000 (04:31 +0000)]
am e4e3bbed: am 8f0d51ac: am 179c15b5: am 70eb8e2e: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev

* commit 'e4e3bbedff8b38556e1c8b8e3d6a2bae63bc3220':

9 years agoam 1de4ab67: am b12465c9: am 4d49c506: am 69d6f10f: am 38669745: Merge "Only force...
Alan Viverette [Fri, 19 Sep 2014 04:30:56 +0000 (04:30 +0000)]
am 1de4ab67: am b12465c9: am 4d49c506: am 69d6f10f: am 38669745: Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev

* commit '1de4ab676b794af5abc92c02f375f920f6caa416':

9 years agoam 1eceb8f8: am ce73b298: am e537a4cd: am f08fb156: am 093e3412: Merge "Additional...
Chris Craik [Fri, 19 Sep 2014 04:30:51 +0000 (04:30 +0000)]
am 1eceb8f8: am ce73b298: am e537a4cd: am f08fb156: am 093e3412: Merge "Additional layer logging" into lmp-dev

* commit '1eceb8f838fd6647faacfa57fe6ea9176306987a':

9 years agoam 80d1ad0a: am 4367855e: am 21405881: am 145a5654: am a6b5869f: Merge "Fix a crash...
Svetoslav [Fri, 19 Sep 2014 04:30:47 +0000 (04:30 +0000)]
am 80d1ad0a: am 4367855e: am 21405881: am 145a5654: am a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev

* commit '80d1ad0abc9004fa56de92626523c33a37bffcd5':

9 years agoam 1920c5de: am 52f38945: am 13fd6eb9: am b2347d2d: am 930f4fe4: Merge "Accessibilty...
Svetoslav [Fri, 19 Sep 2014 04:30:42 +0000 (04:30 +0000)]
am 1920c5de: am 52f38945: am 13fd6eb9: am b2347d2d: am 930f4fe4: Merge "Accessibilty support for the print UI." into lmp-dev

* commit '1920c5de3683b714b30f7273bd70a4b3bb2299fa':

9 years agoam 5092af0d: am d85a5d94: am 57ae772d: am a4368b37: am bed348e3: Merge "Manage mode...
Jeff Sharkey [Fri, 19 Sep 2014 04:30:38 +0000 (04:30 +0000)]
am 5092af0d: am d85a5d94: am 57ae772d: am a4368b37: am bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev

* commit '5092af0d35b014d5be1ee0cc8d4871253a5f8e09':

9 years agoam 15204a5d: am 14f23a1c: am fa49091b: am c97f1d02: am 0b381432: Merge "AudioEffect...
Eric Laurent [Fri, 19 Sep 2014 04:30:34 +0000 (04:30 +0000)]
am 15204a5d: am 14f23a1c: am fa49091b: am c97f1d02: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev

* commit '15204a5de3dcb2075eab3e532f1d63de317f005e':

9 years agoam d52f0983: (-s ours) am 4f93a2ad: (-s ours) am e60acac3: (-s ours) am 6cd00e14...
Baligh Uddin [Fri, 19 Sep 2014 04:30:29 +0000 (04:30 +0000)]
am d52f0983: (-s ours) am 4f93a2ad: (-s ours) am e60acac3: (-s ours) am 6cd00e14: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'd52f0983830d27c957a05644165a68cb4c5cee42':
  Import translations. DO NOT MERGE

9 years agoam c04aa847: (-s ours) am 060d7b62: (-s ours) am 38ad1342: (-s ours) am 75794bdc...
Baligh Uddin [Fri, 19 Sep 2014 04:30:25 +0000 (04:30 +0000)]
am c04aa847: (-s ours) am 060d7b62: (-s ours) am 38ad1342: (-s ours) am 75794bdc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'c04aa847a454c5e814aac0d1a6d665b256802f61':
  Import translations. DO NOT MERGE

9 years agoam 0cb99f60: am 330beab1: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException...
George Mount [Fri, 19 Sep 2014 04:30:21 +0000 (04:30 +0000)]
am 0cb99f60: am 330beab1: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev

* commit '0cb99f60d5967aff1a6359e6e0cec86da835f12b':

9 years agoam 516b446e: am ea66ffeb: am 3350edac: Merge "Revise createIntent and parseResult...
Tao Bai [Fri, 19 Sep 2014 04:30:16 +0000 (04:30 +0000)]
am 516b446e: am ea66ffeb: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev

* commit '516b446e7827c0f5442dc56be454ad66995f17a2':

9 years agoam 3628b337: am de000d64: am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile....
John Spurlock [Fri, 19 Sep 2014 04:30:10 +0000 (04:30 +0000)]
am 3628b337: am de000d64: am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev

* commit '3628b3378a5c359de32d83ae6cb715483d045ee8':

9 years agoam a8d23b06: am 1b6ba208: am cef60b6a: Merge "Wait for animation complete before...
Craig Mautner [Fri, 19 Sep 2014 04:30:04 +0000 (04:30 +0000)]
am a8d23b06: am 1b6ba208: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev

* commit 'a8d23b06b7db488671628e49ffe96090a4bc490f':

9 years agoam cfee8d95: am 91e0ab54: am 61922585: Merge "Add docs to Conference object." into...
Nancy Chen [Fri, 19 Sep 2014 04:30:00 +0000 (04:30 +0000)]
am cfee8d95: am 91e0ab54: am 61922585: Merge "Add docs to Conference object." into lmp-dev

* commit 'cfee8d95bf01d2b51c8ab67314bbe5262143debd':

9 years agoam 98469433: am 28c1f5e6: am b74b8d49: Merge "Move capturing entering views until...
George Mount [Fri, 19 Sep 2014 04:29:55 +0000 (04:29 +0000)]
am 98469433: am 28c1f5e6: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev

* commit '98469433c1b9d219a06f12335ff3cd0083f53da4':

9 years agoam 4d5edfe8: am 8bff37a0: am 804df9eb: Use constant state in AnimatedVectorDrawable
Chet Haase [Fri, 19 Sep 2014 04:29:51 +0000 (04:29 +0000)]
am 4d5edfe8: am 8bff37a0: am 804df9eb: Use constant state in AnimatedVectorDrawable

* commit '4d5edfe8bab528b4df0c8b9961fc3408601ccb88':

9 years agoam b3ea5dfd: am b06387ed: am 9e444d7a: Merge "make autojoin configurable, clean up...
vandwalle [Fri, 19 Sep 2014 04:29:46 +0000 (04:29 +0000)]
am b3ea5dfd: am b06387ed: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit 'b3ea5dfd38b017ed940d37cde74f0ad99acaf1ba':

9 years agoam e646001b: am c654306b: am 6a593012: Merge "Change EmptyArray System.identityHashCo...
Mathieu Chartier [Fri, 19 Sep 2014 04:29:42 +0000 (04:29 +0000)]
am e646001b: am c654306b: am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev

* commit 'e646001b913f65648410b80fa6e1d7da086bb915':

9 years agoam 92ee026c: am 516a1a2c: am a31b4f03: Merge "Remove auto spaceifying behavior on...
Raph Levien [Fri, 19 Sep 2014 04:29:38 +0000 (04:29 +0000)]
am 92ee026c: am 516a1a2c: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev

* commit '92ee026c3d1d06125303a452122eb4c04a83dc1c':

9 years agoam 4eaa1b40: am 679c1736: am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev
Jorim Jaggi [Fri, 19 Sep 2014 04:29:33 +0000 (04:29 +0000)]
am 4eaa1b40: am 679c1736: am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev

* commit '4eaa1b4008e265e4fe74846bbd89e1cad26a1913':

9 years agoam b2e660b6: am 1cbdc26a: am 70968134: Merge "Fix invisible Keyguard" into lmp-dev
Jorim Jaggi [Fri, 19 Sep 2014 04:29:29 +0000 (04:29 +0000)]
am b2e660b6: am 1cbdc26a: am 70968134: Merge "Fix invisible Keyguard" into lmp-dev

* commit 'b2e660b6934d9e9cc38723fbdb71c9f4bc2aedb4':

9 years agoam 3c1e8103: am f17d5ff6: am cfb0664e: Merge "Tries to resolve reference resource...
Jon Miranda [Fri, 19 Sep 2014 04:29:25 +0000 (04:29 +0000)]
am 3c1e8103: am f17d5ff6: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev

* commit '3c1e8103f3f1c703d4ab5a33dcda17a9c3f8e972':

9 years agoam a02ae01d: am 65ff63b4: am 5ea50c1a: TIF: Enable inflating class android.media...
Jae Seo [Fri, 19 Sep 2014 04:29:21 +0000 (04:29 +0000)]
am a02ae01d: am 65ff63b4: am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices

* commit 'a02ae01ddb129e346451d897ec0adc6604f5d9cf':

9 years agoam 564bd559: am 339d1a76: am 0f2e085d: Merge "RTL support for print UI." into lmp-dev
Svetoslav [Fri, 19 Sep 2014 04:29:17 +0000 (04:29 +0000)]
am 564bd559: am 339d1a76: am 0f2e085d: Merge "RTL support for print UI." into lmp-dev

* commit '564bd559ea3490310a6625f603883b2c4d6cdc86':

9 years agoam 76d81def: am 095d50ca: am d327046d: Merge "Fix page spacing in preview list."...
Svetoslav [Fri, 19 Sep 2014 04:29:12 +0000 (04:29 +0000)]
am 76d81def: am 095d50ca: am d327046d: Merge "Fix page spacing in preview list." into lmp-dev

* commit '76d81def7d13b53c85e1f884e9fa0f82fdc7ec8a':

9 years agoam 197afcde: am f833470a: am 90229edc: Merge "Camera2: Allow captures right after...
Eino-Ville Talvala [Fri, 19 Sep 2014 04:29:05 +0000 (04:29 +0000)]
am 197afcde: am f833470a: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev

* commit '197afcde52b64b90eb55ba8b9a23990e76fd6014':

9 years agoam ad182842: am de313b4d: am f668d735: Merge "Set remote connection state after setti...
Sailesh Nepal [Fri, 19 Sep 2014 04:29:00 +0000 (04:29 +0000)]
am ad182842: am de313b4d: am f668d735: Merge "Set remote connection state after setting handle" into lmp-dev

* commit 'ad1828421b0228b06e3c316c8ba036429465a4d5':

9 years agoam 55dfe1c4: am 913ff6af: am eb843b14: Merge "Don\'t accept score below 0." into...
Robert Greenwalt [Fri, 19 Sep 2014 04:28:56 +0000 (04:28 +0000)]
am 55dfe1c4: am 913ff6af: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev

* commit '55dfe1c4a11b9577dd3114e3fd353d425f24e77b':

9 years agoam 3ab5af31: am 06c4a796: am c56e0e50: am 0adb8bb0: am 5debe44b: am 0743bca5: docs...
Robert Ly [Fri, 19 Sep 2014 04:28:52 +0000 (04:28 +0000)]
am 3ab5af31: am 06c4a796: am c56e0e50: am 0adb8bb0: am 5debe44b: am 0743bca5: docs: add 64k method limit note

* commit '3ab5af3162876a50e643f65f17681c6e600fed79':

9 years agoam 93763dc6: am 7129f43d: am 3ea66322: Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver...
Matthew Williams [Fri, 19 Sep 2014 04:28:43 +0000 (04:28 +0000)]
am 93763dc6: am 7129f43d: am 3ea66322: Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" into lmp-dev

* commit '93763dc6412856a5116a097b6be87118bc75b612':

9 years agoam b2824221: am c2ab19a6: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into...
Jeff Davidson [Fri, 19 Sep 2014 04:28:33 +0000 (04:28 +0000)]
am b2824221: am c2ab19a6: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev

* commit 'b2824221ad3b8c8ddff9f8acc3b7f642bb9b213e':

9 years agoam 5218eb66: am 6ac4d0e5: am 6fa0947a: Merge "Virtualizer: replace device type by...
Jean-Michel Trivi [Fri, 19 Sep 2014 04:28:29 +0000 (04:28 +0000)]
am 5218eb66: am 6ac4d0e5: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev

* commit '5218eb669c5a4a637f3ed58495a5509531cab36c':

9 years agoam 57db4f5d: am b17a4166: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev
Eric Laurent [Fri, 19 Sep 2014 04:28:23 +0000 (04:28 +0000)]
am 57db4f5d: am b17a4166: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev

* commit '57db4f5db49889433b0ac25ba12f347d30bb1db8':

9 years agoam 206861c1: am 07437c01: am bf763e77: Merge "Remove some overdraw in Keyguard" into...
Jorim Jaggi [Fri, 19 Sep 2014 04:28:19 +0000 (04:28 +0000)]
am 206861c1: am 07437c01: am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev

* commit '206861c12244ff255465ce998dff341cd5a301c2':

9 years agoam 478118e6: am 988345d4: am 07291645: Merge "Fix QS interception on tablets" into...
Jorim Jaggi [Fri, 19 Sep 2014 04:28:09 +0000 (04:28 +0000)]
am 478118e6: am 988345d4: am 07291645: Merge "Fix QS interception on tablets" into lmp-dev

* commit '478118e641d4b92e1e76fbceaf1c7f071e5020a6':

9 years agoam b8c1246e: am e703d870: am 17fcb255: Merge "camera2: Fix preview stretching in...
Ruben Brunk [Fri, 19 Sep 2014 04:28:04 +0000 (04:28 +0000)]
am b8c1246e: am e703d870: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev

* commit 'b8c1246ed75b363bbd0ac58fa6965fd21b3d812a':

9 years agoam 43875233: am b59cb4a7: am 55bffb50: Merge "Update string value for provisioning...
Esteban Talavera [Fri, 19 Sep 2014 04:28:00 +0000 (04:28 +0000)]
am 43875233: am b59cb4a7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev

* commit '43875233ac4e7ffa76c2ad11f31ac28d4527a5fc':

9 years agoam 9027ecd0: am 3d41139e: am bf671114: Merge "Don\'t let two closing animations run...
Jorim Jaggi [Fri, 19 Sep 2014 04:27:55 +0000 (04:27 +0000)]
am 9027ecd0: am 3d41139e: am bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev

* commit '9027ecd0506f9745855dfa3e9555ffe86886b620':

9 years agoam f7db5688: am baaf1bc6: am abe5f130: Merge "Fixed unnecessary layer creations in...
Selim Cinek [Fri, 19 Sep 2014 04:27:50 +0000 (04:27 +0000)]
am f7db5688: am baaf1bc6: am abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev

* commit 'f7db5688118404eeacd8f108c71ad7a22c5b0018':

9 years agoam 99304684: am e6177f9c: am 89551fab: Merge "Fix blank QS Panel after double tap...
Jason Monk [Fri, 19 Sep 2014 04:27:45 +0000 (04:27 +0000)]
am 99304684: am e6177f9c: am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev

* commit '9930468470a45460bc4f503f2cca4a187b10f885':

9 years agoam 33c5be93: am 20f3d84e: am 1c52586c: Merge "Update zen mode and qs strings on local...
Jason Monk [Fri, 19 Sep 2014 04:27:40 +0000 (04:27 +0000)]
am 33c5be93: am 20f3d84e: am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev

* commit '33c5be938337a9ce0e3cc947eab3aba9b7a89b46':

9 years agoam 3605c945: am f7ef2381: am 473d27fa: Merge "Move zen mode constants and code to...
Jason Monk [Fri, 19 Sep 2014 04:27:35 +0000 (04:27 +0000)]
am 3605c945: am f7ef2381: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev

* commit '3605c9456f57238e9c6425c8ae4dac6523edd6b2':

9 years agoam a1d6340d: am ad503698: am 82126845: Merge "Zen: make Condition available over...
John Spurlock [Fri, 19 Sep 2014 04:27:31 +0000 (04:27 +0000)]
am a1d6340d: am ad503698: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev

* commit 'a1d6340d21c131567699f133f32072b496b2cd81':

9 years agoam 4d089962: am 8f4f2595: am 1fac2ba1: Merge "Use intrinsic size for path animation...
George Mount [Fri, 19 Sep 2014 04:27:25 +0000 (04:27 +0000)]
am 4d089962: am 8f4f2595: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev

* commit '4d0899629f99d2fa4d9b4fdae71bd01d6f9fb9dc':

9 years agoam ccde139f: am cf2d9ba9: am bfbb5882: Merge "Fix fade transition not working with...
George Mount [Fri, 19 Sep 2014 04:27:21 +0000 (04:27 +0000)]
am ccde139f: am cf2d9ba9: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev

* commit 'ccde139f9717284039e22290e5c0510cdd4f329a':

9 years agoam 8e67fa9e: am 464569bd: am 3a972844: Merge "Zen: Make condition providers available...
John Spurlock [Fri, 19 Sep 2014 04:27:16 +0000 (04:27 +0000)]
am 8e67fa9e: am 464569bd: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev

* commit '8e67fa9e2ebf6901087cb8a29fcd36298cce8e94':

9 years agoam 2a7dd1e1: am a4508f49: am 20c285a6: Merge "Fixed a bug where text could overlap...
Selim Cinek [Fri, 19 Sep 2014 04:27:12 +0000 (04:27 +0000)]
am 2a7dd1e1: am a4508f49: am 20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev

* commit '2a7dd1e147997342b26f219cf98b42adc86d5c2f':

9 years agoam dc98c478: am 10c8f541: am 2f52f74c: Merge "Use simpler layout for auto-redacted...
Jorim Jaggi [Fri, 19 Sep 2014 04:27:07 +0000 (04:27 +0000)]
am dc98c478: am 10c8f541: am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev

* commit 'dc98c4787939b7be3aab3b7f92ffd3fd38dc6fb0':

9 years agoam 726e4371: am 2dab5fa3: am 222ff70d: Merge "Inflate guts only when needed" into...
Jorim Jaggi [Fri, 19 Sep 2014 04:27:03 +0000 (04:27 +0000)]
am 726e4371: am 2dab5fa3: am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev

* commit '726e4371a8478285563f6f1b60f8c90527196e7f':

9 years agoam 9154e850: am 52cbaf07: am 500eebbb: Merge "Only unbind agents of the user that...
Adrian Roos [Fri, 19 Sep 2014 04:26:58 +0000 (04:26 +0000)]
am 9154e850: am 52cbaf07: am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev

* commit '9154e850956fe02c0c11fcac87b2a96dfb04ca03':

9 years agoam 81ad22eb: am ad145935: am be125380: Merge "Add system trust agents on first boot...
Adrian Roos [Fri, 19 Sep 2014 04:26:53 +0000 (04:26 +0000)]
am 81ad22eb: am ad145935: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev

* commit '81ad22eb5558c540b72542612364aa863b2e8289':

9 years agoam 2f48d1bf: am a0564f51: am cefee0c8: Merge "Remember userId when stripping / rebuil...
Kenny Guy [Fri, 19 Sep 2014 04:26:48 +0000 (04:26 +0000)]
am 2f48d1bf: am a0564f51: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev

* commit '2f48d1bf279aff064b75bc2e0983c2e53cf632a3':

9 years agoam 2dc55419: am c91e1ede: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInter...
Christoph Studer [Fri, 19 Sep 2014 04:26:43 +0000 (04:26 +0000)]
am 2dc55419: am c91e1ede: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev

* commit '2dc554195ff0cc8d0910e00cc620d7e0c7eafd0d':

9 years agoam 217fc315: am 4a32be20: am c4290acf: Merge "Notification: Use ViewStub for Progress...
Christoph Studer [Fri, 19 Sep 2014 04:26:37 +0000 (04:26 +0000)]
am 217fc315: am 4a32be20: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev

* commit '217fc315261fc5b083d7be4e0dc18e0ca0e1e685':

9 years agoam 08acb292: am d0b63c2e: am 5e1fe70f: Merge "Add feature flags for verified boot...
Adam Connors [Fri, 19 Sep 2014 04:26:32 +0000 (04:26 +0000)]
am 08acb292: am d0b63c2e: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev

* commit '08acb292310b69c0b6d4d0409fd020e28b87844e':

9 years agoam 5fe0c089: am d40d546b: am 107505bd: Merge "Use public APIs to instantiate InputMet...
Yohei Yukawa [Fri, 19 Sep 2014 04:26:28 +0000 (04:26 +0000)]
am 5fe0c089: am d40d546b: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev

* commit '5fe0c089093292d37288fb1a5943c452107ee276':

9 years agoam a85212c7: am 4cc406c5: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_N...
Jessica Hummel [Fri, 19 Sep 2014 04:26:23 +0000 (04:26 +0000)]
am a85212c7: am 4cc406c5: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev

* commit 'a85212c7f7554947909a17a32c3086f9eded5d8e':

9 years agoam 7cd999fe: am 93ba8031: am 8270c789: Merge "Secure access to WifiScanner" into...
Vinit Deshpande [Fri, 19 Sep 2014 04:26:19 +0000 (04:26 +0000)]
am 7cd999fe: am 93ba8031: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit '7cd999fec01d854a6acc0cf38de1021c6c3d77f4':

9 years agoam a6d6e3c6: am 55f43bf9: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEE...
Zhijun He [Fri, 19 Sep 2014 04:26:14 +0000 (04:26 +0000)]
am a6d6e3c6: am 55f43bf9: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

* commit 'a6d6e3c6762a398b039bccfbd505db3921975d90':

9 years agoam fd0d523d: am 1cde98e9: am 9c8a45b5: Merge "Allow protected wifi in connectivity...
Eric Rowe [Fri, 19 Sep 2014 04:26:08 +0000 (04:26 +0000)]
am fd0d523d: am 1cde98e9: am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev

* commit 'fd0d523d252be91ea212336cc8d22db136dd3fad':

9 years agoam 6a42e26d: am 20727825: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode...
Lajos Molnar [Fri, 19 Sep 2014 04:26:04 +0000 (04:26 +0000)]
am 6a42e26d: am 20727825: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev

* commit '6a42e26d91098b2e51e51a1c16fccfb588e2d072':