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

Yohei Yukawa [Tue, 16 Sep 2014 00:14:47 +0000 (00:14 +0000)]

am 3ffd9c34: am 91a7a5f5: am e48df1a5: am 163c3d9a: Merge "Enrich test cases when enabling default IMEs part 2" into lmp-dev

* commit '3ffd9c34e7b2a905c937e899b36786bd7c6e2cd4':

commit | commitdiff | tree

Paul Jensen [Tue, 16 Sep 2014 00:14:43 +0000 (00:14 +0000)]

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

commit | commitdiff | tree

Paul Jensen [Tue, 16 Sep 2014 00:14:37 +0000 (00:14 +0000)]

am 8c154b47: am 07c1084c: am 3d9eb022: am 7f1343ee: Merge "Make Network.openConnection() share HttpHandlers not OkHttpClients." into lmp-dev

* commit '8c154b4732cf836f1cf02b3a4af8c51506358517':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:14:33 +0000 (00:14 +0000)]

am 7a48aaea: am 593f6c29: am 5148c772: am 840b03de: Merge "Don\'t use layers when fading between public/private layout" into lmp-dev

* commit '7a48aaeab158a3cacefcf2ca687de4c2b99e9b5e':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:14:28 +0000 (00:14 +0000)]

am 742498c2: am 08bb1449: am c0f4567f: am 7a094593: Merge "Fix inconsistent layout param in notification" into lmp-dev

* commit '742498c2c2725f1301cd7c320f531a8723965349':

commit | commitdiff | tree

Selim Cinek [Tue, 16 Sep 2014 00:14:24 +0000 (00:14 +0000)]

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

commit | commitdiff | tree

Selim Cinek [Tue, 16 Sep 2014 00:14:19 +0000 (00:14 +0000)]

am 0b2b9037: am 16a7b742: am a148f057: am 31ffc0d6: Merge "Fixed a bug where the drag down animation was behaving wrong" into lmp-dev

* commit '0b2b90373a74472f194395f2950f54e42e14c819':

commit | commitdiff | tree

Selim Cinek [Tue, 16 Sep 2014 00:14:15 +0000 (00:14 +0000)]

am f0dda077: am bba726ee: am f71a1a16: am e4de3fbe: Merge "Fixed a bug where the notifications and the clock could jump" into lmp-dev

* commit 'f0dda07749281eab7e28f40cf82ba9bca5e69763':

commit | commitdiff | tree

Nicolas Prevot [Tue, 16 Sep 2014 00:14:11 +0000 (00:14 +0000)]

am 84506815: am a0b6ea64: am 7e16a563: am db19c5af: Merge "Fix: always allow getProviderMimeType within the same user." into lmp-dev

* commit '84506815e7c02d04104398bd61f9f734fc5a6bad':

commit | commitdiff | tree

Yohei Yukawa [Tue, 16 Sep 2014 00:14:06 +0000 (00:14 +0000)]

am 621a980b: am c270e926: am decf7f1e: am 92701395: Merge "Enrich test cases when enabling default IMEs" into lmp-dev

* commit '621a980beccdde8144077744b806ff12de29018f':

commit | commitdiff | tree

Derek Tan [Tue, 16 Sep 2014 00:14:02 +0000 (00:14 +0000)]

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

commit | commitdiff | tree

Deepanshu Gupta [Tue, 16 Sep 2014 00:13:46 +0000 (00:13 +0000)]

am 98a549ff: am c94d048e: am 2c3cfb90: am 8d89d1e0: Merge "LayoutLib: support font weights." into lmp-dev

* commit '98a549ff69f60a64c46f5b80f86c654a3e663b29':

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 16 Sep 2014 00:13:38 +0000 (00:13 +0000)]

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

commit | commitdiff | tree

Ricardo Cervera [Tue, 16 Sep 2014 00:13:33 +0000 (00:13 +0000)]

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" into klp-mod

* commit 'd83865691977fccc210c9cefcaaee2528bbc9cda':

commit | commitdiff | tree

Ricardo Cervera [Tue, 16 Sep 2014 00:13:29 +0000 (00:13 +0000)]

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

commit | commitdiff | tree

Youngsang Cho [Tue, 16 Sep 2014 00:13:24 +0000 (00:13 +0000)]

am 9d884704: am 06cb29ce: am 95f093cb: am 4608b9d9: Fix build breakage

* commit '9d884704e908ebca7c479155cdbd5df8180d735b':

commit | commitdiff | tree

Terry Heo [Tue, 16 Sep 2014 00:13:20 +0000 (00:13 +0000)]

am 232b724f: am 99827bb4: am 5b915753: am 75cd6c5e: Merge "Add a system API to query hdmi system audio mode" into lmp-dev

* commit '232b724f068297ab5028e3601e25f1a84ff6a035':

commit | commitdiff | tree

Chulwoo Lee [Tue, 16 Sep 2014 00:13:16 +0000 (00:13 +0000)]

am c5d7a8ed: am 221a3d05: am 2e2422ec: am cacba761: Notify of the update of TvInputInfo

* commit 'c5d7a8eddc5eba2a347a6ad162dab0611480b750':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:13:12 +0000 (00:13 +0000)]

am d04618e2: am fd7e8b2e: am d834fa99: am 515699a4: Merge "Use Calendar day of week rather than Time in SimpleMonthView" into lmp-dev

* commit 'd04618e2b84252aa68135ccd2fbfea79bdc1d523':

commit | commitdiff | tree

Svetoslav Ganov [Tue, 16 Sep 2014 00:13:07 +0000 (00:13 +0000)]

am cc50af38: am e1e2a579: am 96ae7282: am f0ccea92: Merge "Using the correct package name for ContentResolver" into lmp-dev

* commit 'cc50af38e3702769c93b78e894780233fb61cb55':

commit | commitdiff | tree

Lajos Molnar [Tue, 16 Sep 2014 00:13:01 +0000 (00:13 +0000)]

am 43d85b50: am 0403c6ef: am 4032fbdc: am c4c153a8: MediaCodec.Image: use image.setCrop() in constructor

* commit '43d85b50726747494e33494ebe04f1d122284c0f':

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 00:12:56 +0000 (00:12 +0000)]

am ab21b72f: am aad459f4: am bc3eadca: am 022cfcda: Merge "Fix issue #17414533: update batterystats occasionally takes a couple..." into lmp-dev

* commit 'ab21b72fc061b3968a60b81b20de62864a4f1aea':

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 00:12:51 +0000 (00:12 +0000)]

am 82603d51: am e2ca8be1: am 26ed2b70: am b4ee4428: Merge "Fix issue #17428001: Fix revokeUriPermissions" into lmp-dev

* commit '82603d51dbc06981fb849aa8ab55858c4767d5bb':

commit | commitdiff | tree

Lajos Molnar [Tue, 16 Sep 2014 00:12:46 +0000 (00:12 +0000)]

am 389307ba: am 2592bd88: am f0c11830: am 3b22910c: Merge "add android.util.SizeF.parseSizeF()" into lmp-dev

* commit '389307ba411783d1ce3e89e59906b5c242a932cd':

commit | commitdiff | tree

Adam Lesinski [Tue, 16 Sep 2014 00:12:41 +0000 (00:12 +0000)]

am 732fd044: am d44b17fe: am 713a0555: am 5acd2166: Merge "Output recent configs in am get-config command" into lmp-dev

* commit '732fd0448d5aa65417c2e967e3abf49bf9ed7d0a':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:12:36 +0000 (00:12 +0000)]

am f663e0fc: am d77a20d7: am 46751736: am 2a94c34d: Merge "Copy opaque over shape in GradientDrawable copy constructor" into lmp-dev

* commit 'f663e0fc18827e32b4aa2bd0e129cd807c269f4f':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:12:29 +0000 (00:12 +0000)]

am fd8d3d3b: am a8416451: am 74361162: am 78f863c7: Merge "Fix docs and nulling behavior for TextView.setCompoundDrawables" into lmp-dev

* commit 'fd8d3d3b4ea80a94467dadb034e1952c26fa5421':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:12:21 +0000 (00:12 +0000)]

am 8f0d51ac: am 179c15b5: am 70eb8e2e: am 8b5ef83e: Merge "Make SearchView styles public, remove public Holo styles added in L" into lmp-dev

* commit '8f0d51acda192cc37e78477956277f1d61e8c21a':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:12:13 +0000 (00:12 +0000)]

am b12465c9: am 4d49c506: am 69d6f10f: am 38669745: Merge "Only force drawing in RippleDrawable when necessary" into lmp-dev

* commit 'b12465c95aadd116d67a1abb783ab315ea8c7465':

commit | commitdiff | tree

Chris Craik [Tue, 16 Sep 2014 00:12:05 +0000 (00:12 +0000)]

am ce73b298: am e537a4cd: am f08fb156: am 093e3412: Merge "Additional layer logging" into lmp-dev

* commit 'ce73b29807747f063584b6223b169776a3f01d0b':

commit | commitdiff | tree

Svetoslav [Tue, 16 Sep 2014 00:11:58 +0000 (00:11 +0000)]

am 4367855e: am 21405881: am 145a5654: am a6b5869f: Merge "Fix a crash in print spooler." into lmp-dev

* commit '4367855ec2b292be76f418eac05a73c6f74c7945':

commit | commitdiff | tree

Svetoslav [Tue, 16 Sep 2014 00:11:54 +0000 (00:11 +0000)]

am 52f38945: am 13fd6eb9: am b2347d2d: am 930f4fe4: Merge "Accessibilty support for the print UI." into lmp-dev

* commit '52f389452debc56413e3b5a6cb1c2791ad33a5dc':

commit | commitdiff | tree

Jeff Sharkey [Tue, 16 Sep 2014 00:11:43 +0000 (00:11 +0000)]

am d85a5d94: am 57ae772d: am a4368b37: am bed348e3: Merge "Manage mode shouldn\'t block for other providers." into lmp-dev

* commit 'd85a5d94e1353ec0e76469fd461d50997db9a120':

commit | commitdiff | tree

Eric Laurent [Tue, 16 Sep 2014 00:11:36 +0000 (00:11 +0000)]

am 14f23a1c: am fa49091b: am c97f1d02: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev

* commit '14f23a1cef8f2227b05c4e8350cb44c5bacf7c1b':

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 00:11:27 +0000 (00:11 +0000)]

am 4f93a2ad: (-s ours) am e60acac3: (-s ours) am 6cd00e14: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '4f93a2adef32cd6b038a0a888bb3496559e9a73a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 00:11:20 +0000 (00:11 +0000)]

am 060d7b62: (-s ours) am 38ad1342: (-s ours) am 75794bdc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '060d7b627a8e66d06dc2e3eb78c08c2751893868':
Import translations. DO NOT MERGE

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:11:15 +0000 (00:11 +0000)]

am 330beab1: am 0b46b913: Merge "Fix ArrayIndexOutOfBoundsException." into lmp-dev

* commit '330beab1af48594ee18f8238ce46270dbfeda378':

commit | commitdiff | tree

Tao Bai [Tue, 16 Sep 2014 00:11:08 +0000 (00:11 +0000)]

am ea66ffeb: am 3350edac: Merge "Revise createIntent and parseResult API." into lmp-dev

* commit 'ea66ffeb6a24b1233e227748fc57e1e117494c38':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:11:04 +0000 (00:11 +0000)]

am de000d64: am 1f35a9b6: Merge "QS: Fix NPE path inside cell tile." into lmp-dev

* commit 'de000d6456f01f7a093c88eb1f85ecdae5da966d':

commit | commitdiff | tree

Craig Mautner [Tue, 16 Sep 2014 00:11:00 +0000 (00:11 +0000)]

am 1b6ba208: am cef60b6a: Merge "Wait for animation complete before completing boot" into lmp-dev

* commit '1b6ba2083e2fdf3463101e590bb925c27c487599':

commit | commitdiff | tree

Nancy Chen [Tue, 16 Sep 2014 00:10:43 +0000 (00:10 +0000)]

am 91e0ab54: am 61922585: Merge "Add docs to Conference object." into lmp-dev

* commit '91e0ab5452aacb58517a25e3dff05c6aa66dea76':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:10:39 +0000 (00:10 +0000)]

am 28c1f5e6: am b74b8d49: Merge "Move capturing entering views until just before transition." into lmp-dev

* commit '28c1f5e6c61b37533ec324a1547655a5dc2cbde6':

commit | commitdiff | tree

Chet Haase [Tue, 16 Sep 2014 00:10:34 +0000 (00:10 +0000)]

am 8bff37a0: am 804df9eb: Use constant state in AnimatedVectorDrawable

* commit '8bff37a0f26401e3cc4153d49b3ae00a456762b1':

commit | commitdiff | tree

vandwalle [Tue, 16 Sep 2014 00:10:29 +0000 (00:10 +0000)]

am b06387ed: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit 'b06387ed9a1f5b3245bbf56e64ac356aca101126':

commit | commitdiff | tree

Mathieu Chartier [Tue, 16 Sep 2014 00:10:25 +0000 (00:10 +0000)]

am c654306b: am 6a593012: Merge "Change EmptyArray System.identityHashCode to Object.hashCode." into lmp-dev

* commit 'c654306bcb649daa3fa6fe0572c0cde0b5715519':

commit | commitdiff | tree

Raph Levien [Tue, 16 Sep 2014 00:10:20 +0000 (00:10 +0000)]

am 516a1a2c: am a31b4f03: Merge "Remove auto spaceifying behavior on paste" into lmp-dev

* commit '516a1a2c3af7fd5665a3d24f051b413da53170fc':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:10:16 +0000 (00:10 +0000)]

am 679c1736: am 303fa836: Merge "Fix PIN/PUK flow" into lmp-dev

* commit '679c1736d9b60da1255e876266d0d482494800aa':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:10:11 +0000 (00:10 +0000)]

am 1cbdc26a: am 70968134: Merge "Fix invisible Keyguard" into lmp-dev

* commit '1cbdc26acbed58af7ac8ce7cb5d8a683f2d0327d':

commit | commitdiff | tree

Jon Miranda [Tue, 16 Sep 2014 00:10:06 +0000 (00:10 +0000)]

am f17d5ff6: am cfb0664e: Merge "Tries to resolve reference resource names instead of its data." into lmp-dev

* commit 'f17d5ff669cd22e0b254d046bf461046f28999fe':

commit | commitdiff | tree

Jae Seo [Tue, 16 Sep 2014 00:10:02 +0000 (00:10 +0000)]

am 65ff63b4: am 5ea50c1a: TIF: Enable inflating class android.media.tv.TvView on non-TV devices

* commit '65ff63b41fe4792989f8c7085cb43f41cee5c9d0':

commit | commitdiff | tree

Svetoslav [Tue, 16 Sep 2014 00:09:58 +0000 (00:09 +0000)]

am 339d1a76: am 0f2e085d: Merge "RTL support for print UI." into lmp-dev

* commit '339d1a76e236d0f1b553c3380d9f9c6db77d2341':

commit | commitdiff | tree

Svetoslav [Tue, 16 Sep 2014 00:09:53 +0000 (00:09 +0000)]

am 095d50ca: am d327046d: Merge "Fix page spacing in preview list." into lmp-dev

* commit '095d50ca1c431ed9f87a53a93cdeaca46ad6f69e':

commit | commitdiff | tree

Eino-Ville Talvala [Tue, 16 Sep 2014 00:09:47 +0000 (00:09 +0000)]

am f833470a: am 90229edc: Merge "Camera2: Allow captures right after abort" into lmp-dev

* commit 'f833470acb6d0a74c53f59ec3970dcee8dfe3aad':

commit | commitdiff | tree

Sailesh Nepal [Tue, 16 Sep 2014 00:09:39 +0000 (00:09 +0000)]

am de313b4d: am f668d735: Merge "Set remote connection state after setting handle" into lmp-dev

* commit 'de313b4d035d3a91ec406d1f31ddee53fa1cc8d7':

commit | commitdiff | tree

Robert Greenwalt [Tue, 16 Sep 2014 00:09:31 +0000 (00:09 +0000)]

am 913ff6af: am eb843b14: Merge "Don\'t accept score below 0." into lmp-dev

* commit '913ff6af364067f0f01e5dfb3352b256a2a52a39':

commit | commitdiff | tree

Robert Ly [Tue, 16 Sep 2014 00:09:23 +0000 (00:09 +0000)]

am 06c4a796: am c56e0e50: am 0adb8bb0: am 5debe44b: am 0743bca5: docs: add 64k method limit note

* commit '06c4a7965f525cad00447b4841dbdbfff7345b55':

commit | commitdiff | tree

Matthew Williams [Tue, 16 Sep 2014 00:09:14 +0000 (00:09 +0000)]

am 7129f43d: am 3ea66322: Merge "Protect LOGIN_ACCOUNTS_CHANGED receiver in SyncManager" into lmp-dev

* commit '7129f43d7e77ff7153e0df79125dc52fbe09089c':

commit | commitdiff | tree

Jeff Davidson [Tue, 16 Sep 2014 00:09:07 +0000 (00:09 +0000)]

am c2ab19a6: am cfd0e5c1: Merge "Update unclear Fragment Javadoc." into lmp-dev

* commit 'c2ab19a647dd310a0fc197fb1a3efb7447582842':

commit | commitdiff | tree

Jean-Michel Trivi [Tue, 16 Sep 2014 00:09:02 +0000 (00:09 +0000)]

am 6ac4d0e5: am 6fa0947a: Merge "Virtualizer: replace device type by virtualization mode" into lmp-dev

* commit '6ac4d0e5709f94e4f2585a8b36e5e97708e43154':

commit | commitdiff | tree

Eric Laurent [Tue, 16 Sep 2014 00:08:57 +0000 (00:08 +0000)]

am b17a4166: am c5db63b6: Merge "Hide AudioDevice class" into lmp-dev

* commit 'b17a41668590cab31b62672a68c21da0ffb9585e':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:08:53 +0000 (00:08 +0000)]

am 07437c01: am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev

* commit '07437c0175b6ac78a5f7ab89c0c5d70260178562':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:08:48 +0000 (00:08 +0000)]

am 988345d4: am 07291645: Merge "Fix QS interception on tablets" into lmp-dev

* commit '988345d47656311b3cdd21109cd17ae506138c05':

commit | commitdiff | tree

Ruben Brunk [Tue, 16 Sep 2014 00:08:43 +0000 (00:08 +0000)]

am e703d870: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev

* commit 'e703d8707f380073c5d1900e8cfa2e75d4ca26da':

commit | commitdiff | tree

Esteban Talavera [Tue, 16 Sep 2014 00:08:39 +0000 (00:08 +0000)]

am b59cb4a7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev

* commit 'b59cb4a77812decf45daaec1572164fac6796b37':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:08:34 +0000 (00:08 +0000)]

am 3d41139e: am bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev

* commit '3d41139eae1781d165278a0378ae6b3e35cb6333':

commit | commitdiff | tree

Selim Cinek [Tue, 16 Sep 2014 00:08:30 +0000 (00:08 +0000)]

am baaf1bc6: am abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev

* commit 'baaf1bc68fe83a22e1503edcfc0e1e8627ad88f6':

commit | commitdiff | tree

Jason Monk [Tue, 16 Sep 2014 00:08:25 +0000 (00:08 +0000)]

am e6177f9c: am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev

* commit 'e6177f9c373e79b7f7d9c7ac4087aa101fc9051b':

commit | commitdiff | tree

Jason Monk [Tue, 16 Sep 2014 00:08:18 +0000 (00:08 +0000)]

am 20f3d84e: am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev

* commit '20f3d84e56c33e06efaf7e08ae5434728c4aa3e9':

commit | commitdiff | tree

Jason Monk [Tue, 16 Sep 2014 00:08:13 +0000 (00:08 +0000)]

am f7ef2381: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev

* commit 'f7ef2381f3fc6469954167db818484db108a59ea':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:08:07 +0000 (00:08 +0000)]

am ad503698: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev

* commit 'ad5036989289662b8ee191715552868a4849ba4b':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:07:59 +0000 (00:07 +0000)]

am 8f4f2595: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev

* commit '8f4f259596e208d385843cdee4f77f006a090bd6':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:07:17 +0000 (00:07 +0000)]

am cf2d9ba9: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev

* commit 'cf2d9ba9bfbe9208345eba028b2b5d0683514ddd':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:07:10 +0000 (00:07 +0000)]

am 464569bd: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev

* commit '464569bdc65e9c833d9fac6b8415b7211d5541e2':

commit | commitdiff | tree

Selim Cinek [Tue, 16 Sep 2014 00:07:04 +0000 (00:07 +0000)]

am a4508f49: am 20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev

* commit 'a4508f49c272424e5b60375591de78fb694f42d7':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:06:59 +0000 (00:06 +0000)]

am 10c8f541: am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev

* commit '10c8f541f6ba97a28b5d9459b6c931ffc93929de':

commit | commitdiff | tree

Jorim Jaggi [Tue, 16 Sep 2014 00:06:54 +0000 (00:06 +0000)]

am 2dab5fa3: am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev

* commit '2dab5fa3173ca34c8fe1907d97b13a232a589af8':

commit | commitdiff | tree

Adrian Roos [Tue, 16 Sep 2014 00:06:46 +0000 (00:06 +0000)]

am 52cbaf07: am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev

* commit '52cbaf0775c347300048ba646d208579965efb35':

commit | commitdiff | tree

Adrian Roos [Tue, 16 Sep 2014 00:06:41 +0000 (00:06 +0000)]

am ad145935: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev

* commit 'ad14593515e55f01c0f7f038db0436a719432585':

commit | commitdiff | tree

Kenny Guy [Tue, 16 Sep 2014 00:06:36 +0000 (00:06 +0000)]

am a0564f51: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev

* commit 'a0564f51a35335f3d3c8a7c9459648670afcb579':

commit | commitdiff | tree

Christoph Studer [Tue, 16 Sep 2014 00:06:31 +0000 (00:06 +0000)]

am c91e1ede: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev

* commit 'c91e1ede413bcd48b11efb75706ffdfee684b3f1':

commit | commitdiff | tree

Christoph Studer [Tue, 16 Sep 2014 00:06:27 +0000 (00:06 +0000)]

am 4a32be20: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev

* commit '4a32be200536fa8c288780099dafb8e46dc6aabc':

commit | commitdiff | tree

Adam Connors [Tue, 16 Sep 2014 00:06:21 +0000 (00:06 +0000)]

am d0b63c2e: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev

* commit 'd0b63c2e5651046fd8912617970acf88836e0003':

commit | commitdiff | tree

Yohei Yukawa [Tue, 16 Sep 2014 00:06:17 +0000 (00:06 +0000)]

am d40d546b: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev

* commit 'd40d546b07fbc2a8c1bbc4d2d558445fb1351d3f':

commit | commitdiff | tree

Jessica Hummel [Tue, 16 Sep 2014 00:06:09 +0000 (00:06 +0000)]

am 4cc406c5: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev

* commit '4cc406c5dd50a2bf39c8c7536832cf5b1964237d':

commit | commitdiff | tree

Vinit Deshpande [Tue, 16 Sep 2014 00:06:03 +0000 (00:06 +0000)]

am 93ba8031: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev

* commit '93ba8031cd8e0ca9f85561eaaf6c70c0353641e2':

commit | commitdiff | tree

Zhijun He [Tue, 16 Sep 2014 00:05:56 +0000 (00:05 +0000)]

am 55f43bf9: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

* commit '55f43bf952073e1e38fd8361aad200c851b7b849':

commit | commitdiff | tree

Eric Rowe [Tue, 16 Sep 2014 00:05:51 +0000 (00:05 +0000)]

am 1cde98e9: am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev

* commit '1cde98e9d35fd13f46af53b6424e5e01b60532b1':

commit | commitdiff | tree

Lajos Molnar [Tue, 16 Sep 2014 00:05:47 +0000 (00:05 +0000)]

am 20727825: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev

* commit '20727825b26c3a026bd710ae18d27e16f63415f4':

commit | commitdiff | tree

Robert Shih [Tue, 16 Sep 2014 00:05:42 +0000 (00:05 +0000)]

am 8d2889ae: am 3b0b5ce3: MediaPlayer/SubtitleController:fix add/select timed text on start

* commit '8d2889aeb835d6429875cfe3a6cc1d8cd179a71b':

commit | commitdiff | tree

Wink Saville [Tue, 16 Sep 2014 00:05:36 +0000 (00:05 +0000)]

am b5942450: Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.

* commit 'b5942450f1c2e873862c3f188a7b116d4164e15e':
Rename answerRingingCallUsingSubId to answrRingingCallForSubscriber.

commit | commitdiff | tree

Wink Saville [Tue, 16 Sep 2014 00:05:28 +0000 (00:05 +0000)]

am b16447cb: Update current.txt for two renamed methods.

* commit 'b16447cb7d1463b2f7f182d2cbbd740ee855d95e':
Update current.txt for two renamed methods.

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:05:21 +0000 (00:05 +0000)]

am b41916f1: am a9962d36: Merge "Improve dialog padding when title or body text are missing" into lmp-dev

* commit 'b41916f1f46b41d3a36a9c6527e950e121826fd1':

commit | commitdiff | tree

Eric Laurent [Tue, 16 Sep 2014 00:05:15 +0000 (00:05 +0000)]

am a00a01e9: am 4f0149fe: Merge "SoundTriggerHelper: handle media server death" into lmp-dev

* commit 'a00a01e98b989a302efb0c241aca03867a500b36':

commit | commitdiff | tree

Junda Liu [Tue, 16 Sep 2014 00:05:10 +0000 (00:05 +0000)]

am eb17ac08: am bdf9cf90: Add ForSubscriber suffix to APIs w/ subId argument.

* commit 'eb17ac08d60bb7bbd8f8235ae43713d13bdb0a3b':

commit | commitdiff | tree

Dianne Hackborn [Tue, 16 Sep 2014 00:05:05 +0000 (00:05 +0000)]

am b5186a1e: am 829b79f6: Merge "Fix build." into lmp-dev

* commit 'b5186a1e5f281c827f337e14cc998c0714d16014':

commit | commitdiff | tree

Amit Mahajan [Tue, 16 Sep 2014 00:05:01 +0000 (00:05 +0000)]

am 238687d2: am 7cd6fc5b: Merge "Support to load default voicemail number from the configuration." into lmp-dev

* commit '238687d23c7df9f1f4f370ff4b07b08f1d5ed4d1':

commit | commitdiff | tree

wsmlby [Tue, 16 Sep 2014 00:04:56 +0000 (00:04 +0000)]

am 92886119: am d1ed1e81: Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev

* commit '928861193378e9f9dc35bb856c050ec3ba839866':

commit | commitdiff | tree

Jinsuk Kim [Tue, 16 Sep 2014 00:04:50 +0000 (00:04 +0000)]

am 8585fb95: am a8c43b25: Merge "CEC: Stub MHL Controller" into lmp-dev

* commit '8585fb956870ba191778ffa485e294cdf006d7f0':

commit | commitdiff | tree

Robert Ly [Tue, 16 Sep 2014 00:04:30 +0000 (00:04 +0000)]

am 53f6e1b2: am bb6ede49: am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september

* commit '53f6e1b2fb51083ac4d1bd2945fbf5fc5fe6c391':

commit | commitdiff | tree

Jeff Tinker [Tue, 16 Sep 2014 00:04:23 +0000 (00:04 +0000)]

am e169cdca: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev

* commit 'e169cdcae09617620f4036824c2899b81e635549':