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

Jeff Davidson [Tue, 16 Sep 2014 00:20:29 +0000 (00:20 +0000)]

am 76e69bd5: am 1dd1308a: am d53f9aa7: am 1e397796: Merge "Update VpnService Javadoc to reflect new UX." into lmp-dev

* commit '76e69bd548550064f8833b0ec4967b13284e0051':

commit | commitdiff | tree

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

am f62631a6: am 45290247: am 3ea01345: am 7f97f2c3: Merge "Add null check to TaskPersister file list." into lmp-dev

* commit 'f62631a638b7ba0084b08426fc0ad368d8a9e8dd':

commit | commitdiff | tree

Prerepa Viswanadham [Tue, 16 Sep 2014 00:20:06 +0000 (00:20 +0000)]

am 81aeebcf: am 5b3c18f5: am 3ea4bc37: am 041299e3: Remove onConnectionCongested callback

* commit '81aeebcfd1b140d92436f3eb8e6dc1669e44b00f':

commit | commitdiff | tree

Jeff Brown [Tue, 16 Sep 2014 00:20:02 +0000 (00:20 +0000)]

am 6c3af3de: am 96fab6c4: am a081f977: am 683872af: Merge "Clean entire arg block when setting process name." into lmp-dev

* commit '6c3af3de4f5716e3116056d1354b0ad7bd3ca631':

commit | commitdiff | tree

Svet Ganov [Tue, 16 Sep 2014 00:19:57 +0000 (00:19 +0000)]

am 0f63d2e4: am 62e7c6a3: am f0c2201d: am 60d4306b: Merge "Fix edit text error state in the print UI." into lmp-dev

* commit '0f63d2e4619844055fdfcbd21edd5419ba3fbcc8':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:19:52 +0000 (00:19 +0000)]

am 1960b028: am 9ff1145f: am 2cccde8a: am 4041d8ed: Merge "Fixed: TransitionSet setStartDelay did nothing." into lmp-dev

* commit '1960b02848065ff13425749233bd6cc21034d5a4':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:19:46 +0000 (00:19 +0000)]

am b948e00b: am 244067ca: am 3e3afc57: am 3081e360: Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev

* commit 'b948e00bdfb645d26e30119ed3b48ed9b544a1fc':

commit | commitdiff | tree

George Mount [Tue, 16 Sep 2014 00:19:40 +0000 (00:19 +0000)]

am 8cc594f3: am 64af611e: am 6a0c4f33: am 51d20c87: Merge "Allow Path approximation to work with a single point Path." into lmp-dev

* commit '8cc594f3ccd331df1c85c524ddd8d1cdad55263f':

commit | commitdiff | tree

Igor Murashkin [Tue, 16 Sep 2014 00:19:33 +0000 (00:19 +0000)]

am bdf9ad6e: am 2bc0962f: am 99f5c635: am 6bb75a48: Merge "camera2.legacy: Add aberration, noisereduction, timestamp source keys" into lmp-dev

* commit 'bdf9ad6ecc7d0d74ee5fad41b021291f7930c7f1':

commit | commitdiff | tree

Sreeram Ramachandran [Tue, 16 Sep 2014 00:19:27 +0000 (00:19 +0000)]

am c1ef19ee: am f398f4f0: am 3a70384d: am 8ab9b4c7: Merge "Hide mutable VpnService APIs to add/remove IP addresses dynamically." into lmp-dev

* commit 'c1ef19eebeb7e24330dfa71662f34c675d3c71df':

commit | commitdiff | tree

Andrew Lee [Tue, 16 Sep 2014 00:19:22 +0000 (00:19 +0000)]

am b96801f3: am 36955380: am 16c12739: am a523c405: Merge "API cleanup for RemoteConnection." into lmp-dev

* commit 'b96801f3ab5bd9376271a69f1789ad113a3205fc':

commit | commitdiff | tree

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

am a578bc66: am b2e69512: am f953099a: am 92168d44: Merge "Fix wifi association tests" into lmp-dev

* commit 'a578bc66f0faa4ce600ba88dea9b8dae74ed5f3d':

commit | commitdiff | tree

Anthony Lee [Tue, 16 Sep 2014 00:19:10 +0000 (00:19 +0000)]

am b3aabf97: am 38e4917b: am c3641224: am 12c83b93: Merge "isValidSlotId() and isValidPhoneId() updated to handle negatives." into lmp-dev

* commit 'b3aabf979b1e006fc3f018ac1011847f3c50c9d0':

commit | commitdiff | tree

ztenghui [Tue, 16 Sep 2014 00:19:03 +0000 (00:19 +0000)]

am 9710be66: am 5cd307d2: am ef2a5e2b: am 0a64dc71: Merge "Finer tessellation can draw better looking shadows for circles." into lmp-dev

* commit '9710be66ff2ce14b3fea718f8392a23cda3d1241':

commit | commitdiff | tree

vandwalle [Tue, 16 Sep 2014 00:18:56 +0000 (00:18 +0000)]

am 04e263ad: am 02379c43: am 8f10b04d: am c7fd0da2: Merge "add option to link only same credential configurations" into lmp-dev

* commit '04e263ad1715948ec66762a7a47f1405458f8c16':

commit | commitdiff | tree

Christopher Tate [Tue, 16 Sep 2014 00:18:49 +0000 (00:18 +0000)]

am 7b3d75cf: am 1e57113a: am dba64c67: am e32b2a5d: Merge "Write new wallpaper files from scratch..." into lmp-dev

* commit '7b3d75cfa87fb3b852e1333bae4b589f403b7845':

commit | commitdiff | tree

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

am 7e4b5c17: am 960b0ce2: am c9affe8f: am 03ee9f82: Merge "Update TelecommManager per API requirements. (1/3)" into lmp-dev

* commit '7e4b5c17bc98dd6702108c7a738cd177b06f226b':

commit | commitdiff | tree

Chris Craik [Tue, 16 Sep 2014 00:18:38 +0000 (00:18 +0000)]

am 2a10b727: am 41dd8528: am 4922a54b: am e4c0e03b: Merge "Update HWUI paint filter to understand new location of skia bitmap filter preference" into lmp-dev

* commit '2a10b7273986544eb3af96ab195f58ebb8ea1895':

commit | commitdiff | tree

Michael Wright [Tue, 16 Sep 2014 00:18:34 +0000 (00:18 +0000)]

am 48204013: am 313dc8f1: am 46424da2: am 54bc6182: Change callback methods from add to register.

* commit '48204013f39b0c5dbad078ea608f0a290994c8e3':

commit | commitdiff | tree

Chet Haase [Tue, 16 Sep 2014 00:18:29 +0000 (00:18 +0000)]

am 72389f7c: am 37aaffaa: am d8638046: am 05cafed0: Merge "Make starting window hw-accelerated" into lmp-dev

* commit '72389f7c0401ca7dd2de2e1d6bb2c65cfd436008':

commit | commitdiff | tree

Xin Guan [Tue, 16 Sep 2014 00:18:24 +0000 (00:18 +0000)]

am e03107ba: am e085fa53: am b93b1551: am 314712e9: Temp enable the log to identify the wake up cause.

* commit 'e03107baa45375c30bcb5426608c7c209e85dc70':

commit | commitdiff | tree

Paul Lawrence [Tue, 16 Sep 2014 00:18:20 +0000 (00:18 +0000)]

am c78a5942: am e780ee91: am 424464c9: am 5f3e819f: Merge "Create correct files in dropbox on encrypted boot" into lmp-dev

* commit 'c78a594292493b4d4330e919e1dcab33f4f6995a':

commit | commitdiff | tree

Robin Lee [Tue, 16 Sep 2014 00:18:03 +0000 (00:18 +0000)]

am bc5ac202: am b44570dc: am e04fa38a: am 7ac7a7d8: Update API

* commit 'bc5ac2027d2e40fd58619c073eb112e5d12b6a20':

commit | commitdiff | tree

Robin Lee [Tue, 16 Sep 2014 00:17:58 +0000 (00:17 +0000)]

am d8378334: am 68f6de47: am b3511891: Update API

* commit 'd83783346fce32e1650406d7ebbb6052d95d0dc7':
Update API

commit | commitdiff | tree

Marcin Kosiba [Tue, 16 Sep 2014 00:17:53 +0000 (00:17 +0000)]

am f74fda28: am 506c8864: am a9b21ffd: am 5128e88e: Merge "Don\'t use reflection when generating the onResourcesLoaded callback." into lmp-dev

* commit 'f74fda28b277691b3005c8b2b0606cf0a010aae1':

commit | commitdiff | tree

John Spurlock [Tue, 16 Sep 2014 00:17:49 +0000 (00:17 +0000)]

am 98188a16: am ad1606af: am e927f7c9: am 5d77d533: Merge "Doze: Introduce a pulse period function." into lmp-dev

* commit '98188a16b3859a144dca6a914fac8013759791f2':

commit | commitdiff | tree

Nancy Chen [Tue, 16 Sep 2014 00:17:45 +0000 (00:17 +0000)]

am 97fe1dc8: am eb46cc49: am 8c613488: am 63a12357: Merge "Make changes to Connection in Telecomm API (1/4)" into lmp-dev

* commit '97fe1dc872b2f331cd68c077f0eed4f98ca68ed5':

commit | commitdiff | tree

Alan Viverette [Tue, 16 Sep 2014 00:17:30 +0000 (00:17 +0000)]

am 15bca17a: am 862c2b5e: am 7bfa761b: am f871566a: Merge "Enable adjustViewBounds on preference icon so that maxWidth is used" into lmp-dev

* commit '15bca17a850ee386fc7c783a52f1dfaf963426c6':

commit | commitdiff | tree

Robin Lee [Tue, 16 Sep 2014 00:17:26 +0000 (00:17 +0000)]

am 98e4673d: am e2e7c7c0: am d89caf28: am 03d82225: Merge "Add DevicePolicyManager PrivateKey mgmt" into lmp-dev

* commit '98e4673d3cca9250dc195a3306132c641364db5b':

commit | commitdiff | tree

RoboErik [Tue, 16 Sep 2014 00:17:20 +0000 (00:17 +0000)]

am ba0e90b8: am 4d8ed9e2: am 818f0991: am 6bd52db9: Merge "Update text appearance in leanback setup" into lmp-dev

* commit 'ba0e90b8ff182d59dcc4b78f186edf5e083d579e':

commit | commitdiff | tree

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

am 6bce9e1a: am d1461d92: am d62b17cb: am 279e0cc4: Merge "Don\'t require CONNECTIVITY_INTERNAL check for protected broadcasts" into lmp-dev

* commit '6bce9e1a89c0dde0b6ad3bf5904f66e5bff57f21':

commit | commitdiff | tree

Amith Yamasani [Tue, 16 Sep 2014 00:16:59 +0000 (00:16 +0000)]

am 5935e2c1: am f9a2da34: am 26aa417f: am 4fa40b32: Fix build

* commit '5935e2c13ecc860c90082006294bc43be06e3d5c':

commit | commitdiff | tree

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

am 3be5b53f: am a130fcbe: am 5d454ae8: am dd18a7f7: Merge "Windows for accessibility with wrong coords on rotation." into lmp-dev

* commit '3be5b53f88e24dd5f5cfeac3656f0de8364f1eff':

commit | commitdiff | tree

Vineeta Srivastava [Tue, 16 Sep 2014 00:16:42 +0000 (00:16 +0000)]

am 4ae45598: am bd4472ae: am 2c5fee70: am bc067325: Merge "Send empty flash for some CDMA carriers for 3way call" into lmp-dev

* commit '4ae45598efbea2995622c40b404bfc696085d839':

commit | commitdiff | tree

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

am 257bf5ed: am 66409239: am 0d2113fd: am 3812a38b: Merge "Add flag to JobParameters for job expired" into lmp-dev

* commit '257bf5ed0f0c2411143ec19bc8a808017ccf76e5':

commit | commitdiff | tree

Tyler Gunn [Tue, 16 Sep 2014 00:16:33 +0000 (00:16 +0000)]

am 6971e71a: am 06f7ec1b: am e9f4ae36: am ba740d4f: Allowing enable/disable of phone accounts. (1/3)

* commit '6971e71ade5bb11decc2d33156e62673b82e552a':

commit | commitdiff | tree

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

am 45754fb2: am 93706c0b: am bdef7fb8: am 48bc7ea4: Merge "API changes in GatewayInfo, Response, and PropertyPresentation (1/4)" into lmp-dev

* commit '45754fb2180708113d68c2c8bfd5d32806d46c7c':

commit | commitdiff | tree

Jon Larimer [Tue, 16 Sep 2014 00:16:24 +0000 (00:16 +0000)]

am 69c93d86: am 515069ad: am 0adeef3e: am 92d7b9a6: am 9d8da659: am d65ab587: am e2b12b1f: am 61c6ff7b: Merge "Fix issue #16794553: Duplicate ArrayMap entries in Bundle..." into klp-dev

* commit '69c93d866fa70cbf25f66df95f7a882be473d6e6':

commit | commitdiff | tree

Amith Yamasani [Tue, 16 Sep 2014 00:16:20 +0000 (00:16 +0000)]

am f1a6feb9: am 1c44c24b: am d4540672: am 30a5e35b: Merge "Apply cross-user restrictions to Shell" into lmp-dev

* commit 'f1a6feb927eb3f584941b09e1e984bbb866e9c52':

commit | commitdiff | tree

ztenghui [Tue, 16 Sep 2014 00:16:15 +0000 (00:16 +0000)]

am ff62fd03: am a26e2620: am 5b06de07: am 8738c8db: Merge "Bring back the fillAlpha and strokeAlpha." into lmp-dev

* commit 'ff62fd030cb0530300a026cb13f3a2bf18c05023':

commit | commitdiff | tree

ztenghui [Tue, 16 Sep 2014 00:16:08 +0000 (00:16 +0000)]

am fafefc32: am f0d61240: am 57b58b03: am e1264a88: Merge "Re-triangulate the spot shadow." into lmp-dev

* commit 'fafefc32ec6eaec878ef4090c528f7627864acce':

commit | commitdiff | tree

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

am 03be308c: am 11e11b97: am 0c9aa9cf: am 8c57b9e9: Merge "More android.media.AudioFormat.Builder javadoc" into lmp-dev

* commit '03be308c89b29f284c64c114eb36d59f9ac53642':

commit | commitdiff | tree

Alexandra Gherghina [Tue, 16 Sep 2014 00:15:58 +0000 (00:15 +0000)]

am 1d552bcb: am 01ae2224: am 82f0d91a: am e667e41b: Merge "Bugfix: use the correct user for ContentResolver calls" into lmp-dev

* commit '1d552bcbbcd0881fd5a306378280acfb7b47816e':

commit | commitdiff | tree

Przemyslaw Szczepaniak [Tue, 16 Sep 2014 00:15:53 +0000 (00:15 +0000)]

am 01e665c3: am 0250b98a: am def1eade: am b0a86a06: Merge "Replace TreeSet with HashSet." into lmp-dev

* commit '01e665c3127ee47061d51523054dddb3bbcdd35a':

commit | commitdiff | tree

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

am d281139c: am 0518e3a5: am 6d0417db: am 1ca196bb: Merge "Omit appearing views that have a parent that is also appearing." into lmp-dev

* commit 'd281139c7689aaeefc5ed921e0eb4ef906593b2b':

commit | commitdiff | tree

Julia Reynolds [Tue, 16 Sep 2014 00:15:38 +0000 (00:15 +0000)]

am 630d37a4: am b6603c8f: am c82b401e: am 086bf8e1: Merge "Allow device owners to update LOCATION_MODE." into lmp-dev

* commit '630d37a4ca26c49ce705fcbcf98cddc19bb21eca':

commit | commitdiff | tree

Yohei Yukawa [Tue, 16 Sep 2014 00:15:26 +0000 (00:15 +0000)]

am 18c92caf: am 664bf410: am 0fdbbb56: am 293e5007: Merge "Enrich test cases when enabling default IMEs part 3" into lmp-dev

* commit '18c92caf908e359c82205b84021c03064e4857de':

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 00:15:18 +0000 (00:15 +0000)]

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

commit | commitdiff | tree

Baligh Uddin [Tue, 16 Sep 2014 00:15:10 +0000 (00:15 +0000)]

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

commit | commitdiff | tree

Alexandra Gherghina [Tue, 16 Sep 2014 00:14:55 +0000 (00:14 +0000)]

am 0d7ba037: am dbbb45fa: am 75aeed1c: am b04106ed: Merge "Remove package level intent forwarding." into lmp-dev

* commit '0d7ba0375a1e62ed956566c9dc84561b4283873a':

commit | commitdiff | tree

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