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

Selim Cinek [Mon, 15 Sep 2014 21:28:59 +0000 (21:28 +0000)]

am 93312cc3: am edf8bc9b: Merge "Fixed a bug that the icon was not animating anymore when updating." into lmp-dev

* commit '93312cc37494c8abef20abb521af2e871a604411':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:28:55 +0000 (21:28 +0000)]

am 6564d6dd: am 9e58d85f: Merge "Properly announcing HUN state for talkback" into lmp-dev

* commit '6564d6dd779e38115d3c9767081941b7c8bc9e79':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:28:50 +0000 (21:28 +0000)]

am 982d44ff: am f844d519: Merge "Avoiding heads-up when accessibility is turned on" into lmp-dev

* commit '982d44ffa4f640c208dce9ce0d9b4b9da724494f':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:28:45 +0000 (21:28 +0000)]

am 7e5fc93d: am bd8dc855: Merge "Do not dim the non-activated notifications on lockscreen" into lmp-dev

* commit '7e5fc93d39889944b7510c51973ff6c2313fb4ba':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:28:40 +0000 (21:28 +0000)]

am 9d6a3a69: am cc597c82: Merge "Apply color to auto-redacted notification" into lmp-dev

* commit '9d6a3a6939c31ec2194399bbe44ae013d3a2f6f2':

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 15 Sep 2014 21:28:30 +0000 (21:28 +0000)]

am 042e2ff5: am 1bb79472: Merge "Extend IKeyChainService AIDL with CACert retrieval" into lmp-dev

* commit '042e2ff550efc73ba8579a2fba972dc07dc80e89':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:28:18 +0000 (21:28 +0000)]

am 9ed16b9c: am 2ea21f45: Merge "Stop logging false error when lingering completes." into lmp-dev

* commit '9ed16b9c2eb8e4a769199c2c555346afe81d0794':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:28:07 +0000 (21:28 +0000)]

am ba8f085d: am 61892299: Merge "Don\'t send listening NetworkRequests to NetworkFactories." into lmp-dev

* commit 'ba8f085d09a5e13fce913446bbdca67b8b95f34a':

commit | commitdiff | tree

Paul Jensen [Mon, 15 Sep 2014 21:27:57 +0000 (21:27 +0000)]

am 45ea12a4: am 6801c1b7: Merge "Implement ConnectivityManager.reportBadNetwork() to trigger network validation." into lmp-dev

* commit '45ea12a45b4535b218c202976fcc9279c0d25b1b':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:27:46 +0000 (21:27 +0000)]

am 1b97ea53: am 71f55d23: Merge "Announcing the stream type when the volume panel comes up" into lmp-dev

* commit '1b97ea53c1dd740a397925274e7a910c07e35857':

commit | commitdiff | tree

Selim Cinek [Mon, 15 Sep 2014 21:27:37 +0000 (21:27 +0000)]

am b4b08afe: am b9a2c1f7: Merge "Fixed a bug with the anti-falsing logic with dismissing" into lmp-dev

* commit 'b4b08afee7d4437128dae3466e47392ecb63e4b5':

commit | commitdiff | tree

Nicolas Prevot [Mon, 15 Sep 2014 21:27:28 +0000 (21:27 +0000)]

am 9357eb6d: am 7d1d9f77: Merge "Allowing a ContentProvider to have a null authority." into lmp-dev

* commit '9357eb6dfa4ae52393486325153978d5f32b263d':

commit | commitdiff | tree

Yohei Yukawa [Mon, 15 Sep 2014 21:27:23 +0000 (21:27 +0000)]

am 8a3a855f: am dcab9fad: Follow up API signature changes of CursorAnchorInfo part 2

* commit '8a3a855f85f9e5412d1ba3a4522b84470af9c1ff':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:27:18 +0000 (21:27 +0000)]

am 071d5fdb: am f71585f6: Merge "Use new device identifier to check if a layout has been set." into lmp-dev

* commit '071d5fdb5fa9510c26d9ad23367c20a3b3aa0668':

commit | commitdiff | tree

Adam Powell [Mon, 15 Sep 2014 21:27:13 +0000 (21:27 +0000)]

am b2fe290f: am d6fa07e7: Merge "New new design for ResolverActivity" into lmp-dev

* commit 'b2fe290f3f5652b87ed6f950b19602dcfbaf834f':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:27:09 +0000 (21:27 +0000)]

am b37aac76: am c52a1286: Merge "Build layoutlib create tests as part of sdk build." into lmp-dev

* commit 'b37aac76800948a6990ca43c852c4bd3419b64ec':

commit | commitdiff | tree

Eric Laurent [Mon, 15 Sep 2014 21:27:04 +0000 (21:27 +0000)]

am 7e32ec61: am 602e21fa: Merge "unhide AudioAttributes flag FLAG_HW_AV_SYNC" into lmp-dev

* commit '7e32ec61f10add62239b1053eff8107d2c42835c':

commit | commitdiff | tree

Jean-Luc Brouillet [Mon, 15 Sep 2014 21:26:59 +0000 (21:26 +0000)]

am 7ac916ee: am 20f2fa31: Merge "Fix rsMatrix documentation." into lmp-dev

* commit '7ac916eebf1f555e72fc613cef091f4d3aa34924':

commit | commitdiff | tree

Vinit Deshpande [Mon, 15 Sep 2014 21:26:54 +0000 (21:26 +0000)]

am 763f89f3: am fc591cc1: Merge "Implement getAvailableChannels" into lmp-dev

* commit '763f89f393915a52031c0e841b941e05b95c4014':

commit | commitdiff | tree

Andreas Gampe [Mon, 15 Sep 2014 21:26:49 +0000 (21:26 +0000)]

am 909eb79f: am cd74e05a: Merge "Frameworks/base: Add native bridge post-fork initialization" into lmp-dev

* commit '909eb79f0970c1bb5f84b0a980f5df22f75e0b47':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:45 +0000 (21:26 +0000)]

am b9ba9f4f: am 1d39bab7: Merge "Update IntelliJ project file for IntelliJ 14" into lmp-dev

* commit 'b9ba9f4f330920b179d366dfb9a4244000eaddd8':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:40 +0000 (21:26 +0000)]

am 95760760: am 45997e76: Merge "Add layoutlib tests to DIST_DIR" into lmp-dev

* commit '9576076031a216752783dd1140d78054948912dd':

commit | commitdiff | tree

Deepanshu Gupta [Mon, 15 Sep 2014 21:26:35 +0000 (21:26 +0000)]

am 5a0dffdc: am f86fe4a8: Merge "Remove warning for null entries in resource array." into lmp-dev

* commit '5a0dffdc31a272bff79ab64382ad609dc66e29ae':

commit | commitdiff | tree

Dirk Dougherty [Mon, 15 Sep 2014 21:26:31 +0000 (21:26 +0000)]

am e80a397c: am f73b4f5e: am d87e0484: am 604ae4c7: am 552e5ce6: Merge "Doc change: Add note to use explicit intent when binding to billing service." into klp-modular-docs

* commit 'e80a397c607a9685b512339c9b05df3c7bac438c':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:26:26 +0000 (21:26 +0000)]

am 7be41e98: am 1c5d160b: Merge "Add FEATURE_GAMEPAD to current.txt" into lmp-dev

* commit '7be41e98410efd59179d972f073af97578a7770d':

commit | commitdiff | tree

Wink Saville [Mon, 15 Sep 2014 21:26:22 +0000 (21:26 +0000)]

am b310c405: am 26207b53: Merge "Change getCurrentPhoneType to SystemApi" into lmp-dev

* commit 'b310c405defd66ac268bd827cbcbc51e0b35cec2':

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Sep 2014 21:26:17 +0000 (21:26 +0000)]

am 2192bff9: am 034fe21c: Merge "Assisted dialing support of MO SMS" into lmp-dev

* commit '2192bff94e352810cb9b41b9ef537abd8c1a4e7a':

commit | commitdiff | tree

Amit Mahajan [Mon, 15 Sep 2014 21:26:12 +0000 (21:26 +0000)]

am b102cb48: am 1fa77bb5: Merge "change the property name about IDP from \'telephony.\' to \'gsm.\'" into lmp-dev

* commit 'b102cb485e533b31db773278e92b20b65432af83':

commit | commitdiff | tree

Chris Craik [Mon, 15 Sep 2014 21:26:06 +0000 (21:26 +0000)]

am ec72bc5c: am 2d0c82ad: Merge "Don\'t track TextureLayer lifecycles in RenderState" into lmp-dev

* commit 'ec72bc5c69cc68e6e454ea612bab786627e9d105':

commit | commitdiff | tree

Sreeram Ramachandran [Mon, 15 Sep 2014 21:26:01 +0000 (21:26 +0000)]

am 36afd7dc: am ccfdd756: Merge "Reserve NetIds 1..50 for OEM use." into lmp-dev

* commit '36afd7dcca77531c3f8ac18dc731f44a36663717':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:25:52 +0000 (21:25 +0000)]

am 3ad2c51b: am 3b64e8dc: Merge "Map KEY_VOICECOMMAND to KEYCODE_VOICE_ASSIST" into lmp-dev

* commit '3ad2c51b1f3fe701e1f3a6ee566b99c25cf135cb':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:25:41 +0000 (21:25 +0000)]

am f3b92715: am d49dc106: Merge "Add FEATURE_GAMEPAD." into lmp-dev

* commit 'f3b9271515e252842c82ef943add258d18cad082':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:25:31 +0000 (21:25 +0000)]

am 9b97ffdc: am 56d11c6e: Merge "Allow wake keys to wake dozing device." into lmp-dev

* commit '9b97ffdc295f1464be869ddcc2a1ec1c38927417':

commit | commitdiff | tree

Michael Wright [Mon, 15 Sep 2014 21:25:22 +0000 (21:25 +0000)]

am 56e7ea02: am 64ae551a: Merge "Remove unused variables from UsbHostManager." into lmp-dev

* commit '56e7ea02d00a60f057c4bdce947d0db097df572a':

commit | commitdiff | tree

Ihab Awad [Mon, 15 Sep 2014 21:25:14 +0000 (21:25 +0000)]

am 885dd94a: am c69b2a66: Merge "Enable (@hidden) video connection support for RemoteConnections" into lmp-dev

* commit '885dd94a613ac2353aabdcbfe88bdeac497961c9':

commit | commitdiff | tree

Robert Ly [Mon, 15 Sep 2014 21:25:09 +0000 (21:25 +0000)]

am 816801b6: am 8414b3b9: am 718803f5: am aa19f1fc: am b5a21ad3: Revert "Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html""

* commit '816801b60a6602f8f5c74818a0978d5fdfae562a':

commit | commitdiff | tree

David Friedman [Mon, 15 Sep 2014 21:25:03 +0000 (21:25 +0000)]

am a14e25b1: am 8fd9c6eb: am 7eabd92a: am 32079484: am 4186379a: Revert "NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html"

* commit 'a14e25b1684fcdd481b674ca150becb0282cac5e':

commit | commitdiff | tree

David Friedman [Mon, 15 Sep 2014 21:24:59 +0000 (21:24 +0000)]

am 86475f14: am a24ba624: am a4c038a7: am 7e8786d9: am c6142d97: NDKr10b changes to be published to DAC NDK page. Staged at: boku.mtv.corp.google.com:9190/tools/sdk/ndk/index.html

* commit '86475f142789365f50041c7bdd1a718af5f12057':

commit | commitdiff | tree

RoboErik [Mon, 15 Sep 2014 21:24:55 +0000 (21:24 +0000)]

am d6175661: am e8a75871: Merge "Possible fix for dead handler in Music button event sending" into lmp-dev

* commit 'd6175661d2b77e79af22c198a2e501902a0bbdc0':

commit | commitdiff | tree

Tom Taylor [Mon, 15 Sep 2014 21:24:47 +0000 (21:24 +0000)]

am 12410ca9: Merge "Revert "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId"" into lmp-sprout-dev

* commit '12410ca93bdbbfdf028163eaf9f341a74152b8f2':
Revert "DO NOT MERGE - Hide new SmsManager API's dealing with SubId"

commit | commitdiff | tree

Tsuwei Chen [Mon, 15 Sep 2014 21:24:42 +0000 (21:24 +0000)]

am cb398716: am 38000b0f: Merge "Manually merge QC\'s change for SUPL_ES." into lmp-dev

* commit 'cb398716fb1ebfd5b7efde75ce5ce9b72e79adec':

commit | commitdiff | tree

Andrew Lee [Mon, 15 Sep 2014 21:24:37 +0000 (21:24 +0000)]

am 3cd32a72: am 32e8bc52: Merge "Rename methods/variables on PhoneAccount for API cleanup." into lmp-dev

* commit '3cd32a7292deacedd7983af944c0d01d496f69d8':

commit | commitdiff | tree

Yorke Lee [Mon, 15 Sep 2014 21:24:28 +0000 (21:24 +0000)]

am d6de001d: am af99dec4: Merge "Replace Calls.FEATURES_NONE with 0 (1/4)" into lmp-dev

* commit 'd6de001d4726d57cd2a0f46e20ed2c55f1c85c22':

commit | commitdiff | tree

Christoph Studer [Mon, 15 Sep 2014 21:24:21 +0000 (21:24 +0000)]

am ed1753f1: am ea3bd1ac: Merge "NoMan: Fix speedbump with multiple package priorities" into lmp-dev

* commit 'ed1753f1901e292a0808bafbdba671a43483dadb':

commit | commitdiff | tree

Tom Taylor [Mon, 15 Sep 2014 21:24:16 +0000 (21:24 +0000)]

am 1033dfc8: am 15854740: Merge "DO NOT MERGE - Hide new SmsManager API\'s dealing with SubId" into lmp-dev

* commit '1033dfc8581bf0be16b1559efccc661ceb5d04cb':

commit | commitdiff | tree

Chris Wren [Mon, 15 Sep 2014 21:24:08 +0000 (21:24 +0000)]

am 2aec86eb: am 9330c3e5: Merge "Bring consistency to FLAG_ONLY_ALERT_ONCE semantics." into lmp-dev

* commit '2aec86ebb1216dc17a3b246ae1e84f7728b0f035':

commit | commitdiff | tree

Kenny Guy [Mon, 15 Sep 2014 21:23:58 +0000 (21:23 +0000)]

am fc39f502: am 4e9c9518: Merge "Renaming of LauncherApps apis" into lmp-dev

* commit 'fc39f502f271961403ba50c811c6b8fca820cef0':

commit | commitdiff | tree

John Spurlock [Mon, 15 Sep 2014 21:23:47 +0000 (21:23 +0000)]

am f9a4aa4b: am e5feafcd: Merge "Zen: Remove suppression of untagged vibrations in zen mode." into lmp-dev

* commit 'f9a4aa4b9a82f47a86d2968297d288bf4c913907':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:23:36 +0000 (21:23 +0000)]

am b867431c: am 7ad90a9a: Merge "Start all resolver activities after keyguard is gone" into lmp-dev

* commit 'b867431ca8d2505ce4605138bdec6711facc34c6':

commit | commitdiff | tree

Craig Mautner [Mon, 15 Sep 2014 21:23:31 +0000 (21:23 +0000)]

am 24d8d5bc: am 8ffe407a: Merge "Relax requirements on Activity.requestVisibleBehind" into lmp-dev

* commit '24d8d5bcc8bef4cf3325f8ae45b2e8a2d9e3cfb1':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:23:23 +0000 (21:23 +0000)]

am 7cc30b3f: am 3361310f: Ensuring that the start delay matches the transition delay. (Bug 16987565)

* commit '7cc30b3f7726d36f0690133518b2821aba436500':

commit | commitdiff | tree

Kenny Guy [Mon, 15 Sep 2014 21:23:19 +0000 (21:23 +0000)]

am 0b796f52: am 652e64d3: Merge "Revert "Ensure ApplicationInfo is for correct user for system/android package." Cache in ActivityThread means this still doesn\'t make sure we will get an ApplicationInfo for the user being requested. So reverting." into lmp-dev

* commit '0b796f52b4680310620c8c4b294c1d5f6767c75e':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:23:13 +0000 (21:23 +0000)]

am 4e646496: am 5d629572: Merge "Restrict line count for BigTextStyle" into lmp-dev

* commit '4e6464963b4241505cbbcd2e24af7470e2227666':

commit | commitdiff | tree

Jorim Jaggi [Mon, 15 Sep 2014 21:23:09 +0000 (21:23 +0000)]

am 5014f120: am 66d3891d: Merge "Fix invisible low prio notifications in SHADE_LOCKED" into lmp-dev

* commit '5014f12078dab138905b7ef0aff801b53541c7db':

commit | commitdiff | tree

Tom O'Neill [Mon, 15 Sep 2014 21:23:04 +0000 (21:23 +0000)]

am 582f4576: am 8fff150b: Merge "Fix a STOPSHIP" into lmp-dev

* commit '582f4576b15719171aba9aebb547527aab4d8d70':

commit | commitdiff | tree

vandwalle [Mon, 15 Sep 2014 21:22:59 +0000 (21:22 +0000)]

am b04bd210: am a35a795f: Merge "add more info to WifiConfiguration.toString: - add the noInternetAccess field - add stats about user triggered wifi state disabling requests - Wifi SSID can change even though we don\'t loose connection, hence it must be looked at with

* commit 'b04bd210afbf304de832ba9ce1510549c7095a86':

commit | commitdiff | tree

Svet Ganov [Mon, 15 Sep 2014 21:22:49 +0000 (21:22 +0000)]

am 898ef76e: am a00c7eb9: Merge "Clicking on partially coverd views by other views or windows." into lmp-dev

* commit '898ef76ee585136b26048bab61e2bc9614690cf1':

commit | commitdiff | tree

Dharmesh Mokani [Mon, 15 Sep 2014 21:22:44 +0000 (21:22 +0000)]

am d8025149: am e70ac872: Merge "Remove old methods : AlwaysOnHotwordDetector" into lmp-dev

* commit 'd802514983075c4644f31d8a1f7f40178a2e7609':

commit | commitdiff | tree

Jason Monk [Mon, 15 Sep 2014 21:22:39 +0000 (21:22 +0000)]

am 808a8550: am 01ac9651: Merge "Update downtime to handle TimeZone change" into lmp-dev

* commit '808a85502880fb9ef48d0d04959c0740049f66b6':

commit | commitdiff | tree

Craig Mautner [Mon, 15 Sep 2014 21:22:34 +0000 (21:22 +0000)]

am 8d3109c3: am 851f7eb5: Merge "Ignore finishing activities when fetching the top" into lmp-dev

* commit '8d3109c37a72540c44fdd83ad3e306c5c7a7ddbf':

commit | commitdiff | tree

George Mount [Mon, 15 Sep 2014 21:22:28 +0000 (21:22 +0000)]

am 9a7d1e22: am f7b281a6: Merge "Use Alpha instead of TransitionAlpha for Activity Transitions." into lmp-dev

* commit '9a7d1e228ff989f6fa8978c0b327181996da1cd9':

commit | commitdiff | tree

Jason Monk [Mon, 15 Sep 2014 21:22:23 +0000 (21:22 +0000)]

am 8fb15b66: am 24229aff: Merge "Add VPN Key to signal icons" into lmp-dev

* commit '8fb15b66f68f9043aa8d972776973c5071c07551':

commit | commitdiff | tree

Nancy Chen [Mon, 15 Sep 2014 21:22:18 +0000 (21:22 +0000)]

am e56dbd12: am 0efb7dcf: Merge "Make changes to Telecomm API per review guidelines." into lmp-dev

* commit 'e56dbd12b0bb62d0c959a83ad071f14685a3f64b':

commit | commitdiff | tree

Chris Craik [Mon, 15 Sep 2014 21:22:14 +0000 (21:22 +0000)]

am bc1c0c2c: am 8bc6e915: Merge "Fix save count offsetting within DisplayList chunks" into lmp-dev

* commit 'bc1c0c2ce8f85071e0ae6f67c1cec9ee93898c62':

commit | commitdiff | tree

Jeff Sharkey [Mon, 15 Sep 2014 21:22:07 +0000 (21:22 +0000)]

am 2993c25b: am 2f0ed017: Merge "Delayed ASEC allocation, refine progress handling." into lmp-dev

* commit '2993c25b5b0fb23d0ea1a1c1a18e5df6f0848617':

commit | commitdiff | tree

Nicolas Prevot [Mon, 15 Sep 2014 21:21:59 +0000 (21:21 +0000)]

am 5ca1b6c0: am 09286405: Merge "Marking two flags as final." into lmp-dev

* commit '5ca1b6c0a23e06deb30bc73b4d092687d3d3e4ec':

commit | commitdiff | tree

George Mount [Mon, 15 Sep 2014 21:21:51 +0000 (21:21 +0000)]

am 4db8acfb: am 850bca01: Merge "Only call setHasTransientState in captureHierarchy." into lmp-dev

* commit '4db8acfb99052401138e3da1216033d842e26489':

commit | commitdiff | tree

George Mount [Mon, 15 Sep 2014 21:21:44 +0000 (21:21 +0000)]

am ef63b7fc: am c452d4c9: Merge "Improve Visibility parent value check." into lmp-dev

* commit 'ef63b7fc0b9f7bc8de1a31d635366fde81c05fb9':

commit | commitdiff | tree

Kenny Guy [Mon, 15 Sep 2014 21:21:40 +0000 (21:21 +0000)]

am 288c931c: am b78a0a11: Merge "Ensure ApplicationInfo is for correct user for system/android package." into lmp-dev

* commit '288c931c088826737d71aaa3ffdda72f11e87fcd':

commit | commitdiff | tree

Przemyslaw Szczepaniak [Mon, 15 Sep 2014 21:21:35 +0000 (21:21 +0000)]

am df812a09: am 4dc1f927: Merge "API review requests for the TTS package." into lmp-dev

* commit 'df812a0956f7e37deb2d2afbea2a29169aaa3622':

commit | commitdiff | tree

Yohei Yukawa [Mon, 15 Sep 2014 21:21:31 +0000 (21:21 +0000)]

am f552f8ef: am d01f3c9c: Follow up API signature changes of CursorAnchorInfo

* commit 'f552f8efe93acea61ae3164b0d7247de3f4bf872':

commit | commitdiff | tree

Yohei Yukawa [Mon, 15 Sep 2014 21:21:26 +0000 (21:21 +0000)]

am 90c83b97: am 888edbfe: L API proposal: Introduce IS_RTL flag

* commit '90c83b972e8886a5e7a7fe4e68c942fce02ecb0c':

commit | commitdiff | tree

Alan Viverette [Mon, 15 Sep 2014 21:21:21 +0000 (21:21 +0000)]

am 3bf3d5a2: am d8bbf4cd: Merge "Add first day of week API to date picker" into lmp-dev

* commit '3bf3d5a238f87f3d53a320dd7e236f1ab555a4de':

commit | commitdiff | tree

Amith Yamasani [Mon, 15 Sep 2014 21:21:11 +0000 (21:21 +0000)]

am 6a52dd56: am 081ba853: Merge "Use correct API for badging" into lmp-dev

* commit '6a52dd56f694540dbf65265ad83cf05dbc5b9115':

commit | commitdiff | tree

Craig Mautner [Mon, 15 Sep 2014 21:21:01 +0000 (21:21 +0000)]

am f1bcf651: am 86f289be: Merge "Lock down window manager while changing opacity" into lmp-dev

* commit 'f1bcf6512b6b1ff386dfd3d6d8c4fa3a3b6fda56':

commit | commitdiff | tree

Jae Seo [Mon, 15 Sep 2014 21:20:51 +0000 (21:20 +0000)]

am 7259ea1b: am 8f2f5184: Merge "TIF: Update Java doc for notifyVideoAvailable/notifyVideoUnavailable" into lmp-dev

* commit '7259ea1bc6767e85d529ede428a25a32d5e6c75b':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:20:44 +0000 (21:20 +0000)]

am 66bbb495: am 27e95059: Ensuring that we retry if the callback for animation started comes before the Recents activity starts. (Bug 17316671)

* commit '66bbb495060f21cabb13f576be4b3f8ffc13f091':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:20:37 +0000 (21:20 +0000)]

am 3c4b426d: am 04682c2f: Removing unnecessary delays, ensuring transition thumbnail is the size of the header. (Bug. 16987565)

* commit '3c4b426d27bf29b5875f42740abe6999c25e6acc':

commit | commitdiff | tree

Winson Chung [Mon, 15 Sep 2014 21:20:28 +0000 (21:20 +0000)]

am a232acd9: am b6f90339: Revert "Delay in app transition until home animation completes. (Bug 17012456)"

* commit 'a232acd9edfb267c31ea57b357d07642836147ea':

commit | commitdiff | tree

Eric Laurent [Mon, 15 Sep 2014 21:20:16 +0000 (21:20 +0000)]

am 53d37721: am 2ff0e25f: Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev

* commit '53d3772169f5f31f607ca5e9e4c35cb60e86d7df':

commit | commitdiff | tree

Dianne Hackborn [Mon, 15 Sep 2014 21:20:07 +0000 (21:20 +0000)]

am 9efd4f26: am 9a77bddd: Merge "Fix issue #17391969: Only exception on Message.recycle() when target-sdk > 20" into lmp-dev

* commit '9efd4f26667761bb2d2aee5749034b607cb69077':

commit | commitdiff | tree

Dianne Hackborn [Mon, 15 Sep 2014 21:20:00 +0000 (21:20 +0000)]

am 88b808af: am 6a83e4d1: Merge "Work on issue #17357238: Recents is often slow if not used in a while" into lmp-dev

* commit '88b808afbea3f8b2e9e704a42fdcfeacf128e3bb':

commit | commitdiff | tree

Unsuk Jung [Mon, 15 Sep 2014 21:19:55 +0000 (21:19 +0000)]

am 13d47d97: am 2ba17d31: Merge "Add a hardware feature definition corresponding to audio output support." into lmp-dev

* commit '13d47d973e067c3990a29b4f55e2d14806d439b4':

commit | commitdiff | tree

Etan Cohen [Mon, 15 Sep 2014 21:19:51 +0000 (21:19 +0000)]

am e12b9a52: am aa329284: Modified VoLTE configuration: separate device and carrier configs.

* commit 'e12b9a52cb9a82e611c34042aafe934a2b6b66d6':

commit | commitdiff | tree

Eric Rowe [Mon, 15 Sep 2014 21:19:46 +0000 (21:19 +0000)]

am 23818a23: am 94614a7e: Merge "Increase long timeout to 2 minutes" into lmp-dev

* commit '23818a2329ae4d200d69250a1d4bfa9a9370a4d4':

commit | commitdiff | tree

Christopher Tate [Mon, 15 Sep 2014 21:19:42 +0000 (21:19 +0000)]

am 0c6a6d81: am 57f1f19d: Merge "Fix binder identity use when clearing wallpapers" into lmp-dev

* commit '0c6a6d81735d4b127558d35ba6be702bdcad3711':

commit | commitdiff | tree

Junda Liu [Mon, 15 Sep 2014 21:19:34 +0000 (21:19 +0000)]

am 1dc43851: am 8e250c57: Merge "Hide APIs for simplified network settings." into lmp-dev

* commit '1dc43851a4d2f35c1b67777c0aa37da2fd742121':

commit | commitdiff | tree

Dianne Hackborn [Mon, 15 Sep 2014 21:19:29 +0000 (21:19 +0000)]

am adba548b: am 8c7605b1: Merge "Fix issue #17397177: BatteryStats reporting error on job start/stop" into lmp-dev

* commit 'adba548b24a933969c36c76a8ae8cb0a5fc27f7b':

commit | commitdiff | tree

Justin Koh [Mon, 15 Sep 2014 21:19:24 +0000 (21:19 +0000)]

am e72845ca: am 5b3d4452: Merge "Make the image wallpaper component overlayable" into lmp-dev

* commit 'e72845ca9ad0a74ea2ee2cfb42d14e24b9bc453f':

commit | commitdiff | tree

Jon Miranda [Mon, 15 Sep 2014 21:19:19 +0000 (21:19 +0000)]

am 9d94f9fd: am 9f7fee39: Merge "Added getStyleAttributes to access all Theme attributes." into lmp-dev

* commit '9d94f9fd4e6a4677aca741a4e826578296c17c92':

commit | commitdiff | tree

John Reck [Mon, 15 Sep 2014 21:19:14 +0000 (21:19 +0000)]

am 0f4c8b14: am fd289c1c: Merge "Disable RT-anim for AnimatorSet" into lmp-dev

* commit '0f4c8b147a038727a098af16617f3be41c4f0965':

commit | commitdiff | tree

Alan Viverette [Mon, 15 Sep 2014 21:19:09 +0000 (21:19 +0000)]

am 126766a0: am 9239ba20: Merge "Propagate drawable hotspots when duplicate parent state is enabled" into lmp-dev

* commit '126766a0f6fed7ce9e8ffac2dbed2ed2e24e5842':

commit | commitdiff | tree

Derek Tan [Mon, 15 Sep 2014 21:19:05 +0000 (21:19 +0000)]

am 8e4dc66c: am de6fefb4: Merge "Update the preferred network type APIs." into lmp-dev

* commit '8e4dc66c66fa85557dae2242b869b826972a15a3':

commit | commitdiff | tree

Tsuwei Chen [Mon, 15 Sep 2014 21:19:00 +0000 (21:19 +0000)]

am a82c9676: am 30028094: Merge "Properly register all Intent filters. Bug: 17408889 Change-Id: Iff740def80eb50e0dc8391d7212a3ae7eeaed152" into lmp-dev

* commit 'a82c967603e55332627e79bdaf31609e336e9dee':

commit | commitdiff | tree

Adam Lesinski [Mon, 15 Sep 2014 21:18:55 +0000 (21:18 +0000)]

am 7b86ca0e: am b604d63b: Store time offsets for UsageStats XML

* commit '7b86ca0eefe53d4cce509206158aac4ffd769a2a':

commit | commitdiff | tree

Adam Lesinski [Mon, 15 Sep 2014 21:18:50 +0000 (21:18 +0000)]

am ce5e15df: am 0955da29: Merge "Returns UsageEvents from previous days" into lmp-dev

* commit 'ce5e15df607af3d13f25d59457cd04b5586b39fc':

commit | commitdiff | tree

Derek Tan [Mon, 15 Sep 2014 21:18:46 +0000 (21:18 +0000)]

am 5a6192e9: am 6f25963e: Merge "Remove setCdmaSubscription API." into lmp-dev

* commit '5a6192e98f3bd259d85839171c5d7b9b6a0f7c76':

commit | commitdiff | tree

Derek Tan [Mon, 15 Sep 2014 21:18:38 +0000 (21:18 +0000)]

am b4a08731: am d16f633f: Merge "Update the comment in sendEnvelope." into lmp-dev

* commit 'b4a087318dd97229e997609606faabfb6dfe8d00':

commit | commitdiff | tree

Shishir Agrawal [Mon, 15 Sep 2014 21:18:29 +0000 (21:18 +0000)]

am 218ad326: am 32148644: Merge "API change: SetOperatorBrandOverride should not take iccId as a param." into lmp-dev

* commit '218ad3269ff86fb6c9c87e181ae8911343e452f4':

commit | commitdiff | tree

Santos Cordon [Mon, 15 Sep 2014 21:18:18 +0000 (21:18 +0000)]

am edd8e0d6: am 6918cef8: Merge "Updating APIs for CDMA conference call support." into lmp-dev

* commit 'edd8e0d6bd5ebe3411a98f1dac528082b488382d':