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

Justin Harrison [Fri, 5 Dec 2014 16:26:02 +0000 (16:26 +0000)]

am b1ab736f: am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev

* commit 'b1ab736f48c68de8c92afb1fb6da22232badfbb8':
Revert "Improve fling physics for recents"

commit | commitdiff | tree

Justin Harrison [Fri, 5 Dec 2014 15:51:33 +0000 (15:51 +0000)]

am fdb33a08: am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev

* commit 'fdb33a08266d95c338c141446c1da09108194281':
Revert "Improve fling physics for recents"

commit | commitdiff | tree

Scott Main [Fri, 5 Dec 2014 03:47:09 +0000 (03:47 +0000)]

Merge "docs: studio basics v2"

commit | commitdiff | tree

Rich Slogar [Thu, 20 Nov 2014 21:49:05 +0000 (13:49 -0800)]

docs: studio basics v2

Change-Id: Ice8e4338f5193f9850da8264a2c56018a8b561ab

commit | commitdiff | tree

Scott Main [Fri, 5 Dec 2014 00:22:11 +0000 (00:22 +0000)]

Merge "docs: debugging studio"

commit | commitdiff | tree

Scott Main [Fri, 5 Dec 2014 00:21:15 +0000 (00:21 +0000)]

Merge "docs:setting up hardware devices"

commit | commitdiff | tree

Amith Yamasani [Fri, 5 Dec 2014 00:15:57 +0000 (00:15 +0000)]

am 2faf91fb: am 66cbec51: am d234dc1f: Merge "Correct check of is user running"

* commit '2faf91fbb300882afd1092b788aa16295eb3dde8':
Correct check of is user running

commit | commitdiff | tree

Mike Lockwood [Fri, 5 Dec 2014 00:15:42 +0000 (00:15 +0000)]

am a6e14c82: am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"

* commit 'a6e14c8293ef470e29541500506de15d61ab6bf0':
Dont call close in in BluetoothA2dp finalize

commit | commitdiff | tree

Jorim Jaggi [Fri, 5 Dec 2014 00:13:20 +0000 (00:13 +0000)]

am 638e8068: am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev

* commit '638e8068d212ff72b16d11891af0d9ed110bafde':
Improve fling physics for recents

commit | commitdiff | tree

Jorim Jaggi [Fri, 5 Dec 2014 00:13:15 +0000 (00:13 +0000)]

am b6d16dc5: am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev

* commit 'b6d16dc53fab12099af7d6da406f88bf585b0532':
Fix rounded corners in bottom QS panel.

commit | commitdiff | tree

John Reck [Fri, 5 Dec 2014 00:06:34 +0000 (16:06 -0800)]

resolved conflicts for merge of 203c8171 to master

Change-Id: I256397410c261fae049bae4572f132235be1c5c9

commit | commitdiff | tree

Yin-Chia Yeh [Thu, 4 Dec 2014 19:56:10 +0000 (11:56 -0800)]

Camera2: add toString implementation of LensShadingMap

Change-Id: Icecde57e92c2962ed6b1585c0e3fd889b2587736

commit | commitdiff | tree

Amith Yamasani [Thu, 4 Dec 2014 23:24:31 +0000 (23:24 +0000)]

am 66cbec51: am d234dc1f: Merge "Correct check of is user running"

* commit '66cbec512cf31228f8d86171f57cf4e3bcbbd63e':
Correct check of is user running

commit | commitdiff | tree

Amith Yamasani [Thu, 4 Dec 2014 23:15:47 +0000 (23:15 +0000)]

am d234dc1f: Merge "Correct check of is user running"

* commit 'd234dc1f20d3a68e0dd9f2c3a5f14282fba79b13':
Correct check of is user running

commit | commitdiff | tree

Amith Yamasani [Thu, 4 Dec 2014 23:09:46 +0000 (23:09 +0000)]

Merge "Correct check of is user running"

commit | commitdiff | tree

Mike Lockwood [Thu, 4 Dec 2014 22:45:07 +0000 (22:45 +0000)]

am 75b25577: am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"

* commit '75b2557725430e768cc3b21bb9c2aef92b887538':
Dont call close in in BluetoothA2dp finalize

commit | commitdiff | tree

Christoph Studer [Thu, 4 Dec 2014 21:56:22 +0000 (21:56 +0000)]

am 51347595: am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

* commit '51347595a3ea7749b2c771ac1e8f8f729a55e1a9':
RankingHelper: Remove STOPSHIP

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:56:16 +0000 (21:56 +0000)]

am 9c403d85: am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev

* commit '9c403d8513db5790364e9f5fafca5c6cf896d369':
Ensure that RandomAccessFile is not leaked.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:56:12 +0000 (21:56 +0000)]

am 940a1e56: am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev

* commit '940a1e563fd94f912a7322cea8f0a5662b79050f':
Fix AnalogClock rendering

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:56:07 +0000 (21:56 +0000)]

am 028df22f: am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev

* commit '028df22fd774c8a545dedb03124587b7a19e047b':
Fix typos in previous bugfixes.

commit | commitdiff | tree

Jinsuk Kim [Thu, 4 Dec 2014 21:56:02 +0000 (21:56 +0000)]

am 49216763: am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev

* commit '4921676345a8b15eadb3ca3e72f103e09027cd1e':
CEC: Generate hotplug events upon adding listener

commit | commitdiff | tree

Vinit Deshpande [Thu, 4 Dec 2014 21:55:58 +0000 (21:55 +0000)]

am f04e214a: am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev

* commit 'f04e214a6b949593b9ea83486223a21cc15e1fd0':
Remove notification for SoftAP turned on

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:55:52 +0000 (21:55 +0000)]

am 72142eb1: (-s ours) am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '72142eb12a6c5362126d0d8a4060c4c90dc30766':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:55:48 +0000 (21:55 +0000)]

am 9088853d: (-s ours) am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '9088853d708b3cbca3e5dab69fea603be8eb0d83':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:55:43 +0000 (21:55 +0000)]

am 91b95c96: (-s ours) am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '91b95c96127a85913854f2ad0a0ed0fad807c9a1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Erik Kline [Thu, 4 Dec 2014 21:55:38 +0000 (21:55 +0000)]

am 180a30aa: am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

* commit '180a30aa57e0790453944533dc442704f7596f65':
Remove CONNECTIVITY_CHANGE_DELAY and friends.

commit | commitdiff | tree

John Spurlock [Thu, 4 Dec 2014 21:55:34 +0000 (21:55 +0000)]

am c82144fd: am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev

* commit 'c82144fd8fd2d6f240b17e7b47b41fe7e198b841':
Doze: Don't block pickup pulses on a proximity check.

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 4 Dec 2014 21:55:29 +0000 (21:55 +0000)]

am 10f47f92: am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev

* commit '10f47f9233484763a8a0e0c8e36f68dd28056485':
IMS Call End Cause Additions

commit | commitdiff | tree

duho.ro [Thu, 4 Dec 2014 21:55:24 +0000 (21:55 +0000)]

am 7c614473: am 36ccf75b: am fb754252: UICC : discard language setting of SIM

* commit '7c6144730b347fa93ce124cbf5244f5eaa2ca255':
UICC : discard language setting of SIM

commit | commitdiff | tree

Cheuksan Wang [Thu, 4 Dec 2014 21:55:19 +0000 (21:55 +0000)]

am 29ac679f: am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev

* commit '29ac679f9f85a68eca03c262e740d62f8af66797':
new SMS/MMS carrier app API

commit | commitdiff | tree

John Reck [Thu, 4 Dec 2014 21:51:41 +0000 (13:51 -0800)]

resolved conflicts for merge of a75b0ad3 to master

Change-Id: I32a2d129c556407727ada909daa6470309d42499

commit | commitdiff | tree

Mike Lockwood [Thu, 4 Dec 2014 21:49:56 +0000 (21:49 +0000)]

am 448403b7: Merge "Dont call close in in BluetoothA2dp finalize"

* commit '448403b7a4b2126e79121482d1fb2894133dfa25':
Dont call close in in BluetoothA2dp finalize

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 21:47:35 +0000 (21:47 +0000)]

am 9f44ea8f: am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev

* commit '9f44ea8fbcee80816f4ce6eeca2568ccd06d5a15':
Improve fling physics for recents

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 21:47:28 +0000 (21:47 +0000)]

am d3cf181d: am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev

* commit 'd3cf181d57bb7d63ea8dc6834daf8e3c84f1c769':
Fix rounded corners in bottom QS panel.

commit | commitdiff | tree

Derek Sollenberger [Thu, 4 Dec 2014 21:46:39 +0000 (21:46 +0000)]

am c1a2f38c: am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev

* commit 'c1a2f38ce0447b005d0cde6836857f451af84dc6':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.

commit | commitdiff | tree

Christoph Studer [Thu, 4 Dec 2014 21:46:32 +0000 (21:46 +0000)]

am a6ecb61e: am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

* commit 'a6ecb61ee7a87af7153f11289d7df1eb6f1beb67':
RankingHelper: Remove STOPSHIP

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:46:26 +0000 (21:46 +0000)]

am 43d0e675: am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev

* commit '43d0e67573e8122d9e75accb00eaa453e2755713':
Ensure that RandomAccessFile is not leaked.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:46:20 +0000 (21:46 +0000)]

am 52a60ff6: am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev

* commit '52a60ff6366a4f5cf1ed9697b7cebd6f9300de2b':
Fix AnalogClock rendering

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 21:46:14 +0000 (21:46 +0000)]

am c16d1448: am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev

* commit 'c16d1448bb139384cc86d14d9412ffe1a62817c8':
Fix typos in previous bugfixes.

commit | commitdiff | tree

Jinsuk Kim [Thu, 4 Dec 2014 21:46:08 +0000 (21:46 +0000)]

am 92a46272: am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev

* commit '92a4627250d74264719eff3ade798a9f4480ed5a':
CEC: Generate hotplug events upon adding listener

commit | commitdiff | tree

Vinit Deshpande [Thu, 4 Dec 2014 21:46:01 +0000 (21:46 +0000)]

am aefb79b2: am 31bd4220: Merge "Remove notification for SoftAP turned on" into lmp-mr1-dev

* commit 'aefb79b2dd13047630ba455d5a3aec8084c1d954':
Remove notification for SoftAP turned on

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:45:55 +0000 (21:45 +0000)]

am c7d8a48b: (-s ours) am cc7c68b5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:45:48 +0000 (21:45 +0000)]

am c7b52575: (-s ours) am a821e77d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 21:45:42 +0000 (21:45 +0000)]

am 5d1f6880: (-s ours) am 72a20419: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '5d1f68803488677637b1f383d0f1162a896a9684':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Erik Kline [Thu, 4 Dec 2014 21:45:33 +0000 (21:45 +0000)]

am 95b5ca90: am 9261d9d6: Merge "Remove CONNECTIVITY_CHANGE_DELAY and friends." into lmp-mr1-dev

* commit '95b5ca9019720c4c012ca13791d32aa6d0bb5ba8':
Remove CONNECTIVITY_CHANGE_DELAY and friends.

commit | commitdiff | tree

John Spurlock [Thu, 4 Dec 2014 21:45:26 +0000 (21:45 +0000)]

am 95931270: am 32b61ab2: Merge "Doze: Don\'t block pickup pulses on a proximity check." into lmp-mr1-dev

* commit '959312701f55c9d098403c332b88b5777daf4e4c':
Doze: Don't block pickup pulses on a proximity check.

commit | commitdiff | tree

Pavel Zhamaitsiak [Thu, 4 Dec 2014 21:45:21 +0000 (21:45 +0000)]

am 38916819: am 1fb69936: Merge "IMS Call End Cause Additions" into lmp-mr1-dev

* commit '38916819693a69fbc882ac509e60ef0b6419c5dc':
IMS Call End Cause Additions

commit | commitdiff | tree

duho.ro [Thu, 4 Dec 2014 21:45:14 +0000 (21:45 +0000)]

am 36ccf75b: am fb754252: UICC : discard language setting of SIM

* commit '36ccf75bb26604786f1d99ab1703ba01f8c3290c':
UICC : discard language setting of SIM

commit | commitdiff | tree

Cheuksan Wang [Thu, 4 Dec 2014 21:45:08 +0000 (21:45 +0000)]

am dba26aa2: am 109ec376: Merge "new SMS/MMS carrier app API" into lmp-mr1-dev

* commit 'dba26aa2e793b037839c608319534b100d2c3dbe':
new SMS/MMS carrier app API

commit | commitdiff | tree

Mike Lockwood [Thu, 4 Dec 2014 21:41:12 +0000 (21:41 +0000)]

Merge "Dont call close in in BluetoothA2dp finalize"

commit | commitdiff | tree

John Reck [Thu, 4 Dec 2014 21:41:04 +0000 (13:41 -0800)]

resolved conflicts for merge of a51a0901 to lmp-mr1-dev-plus-aosp

Change-Id: Id7df835f0bd3d5d276b162635ddfb7fe0918dfed

commit | commitdiff | tree

Winson Chung [Thu, 4 Dec 2014 21:24:02 +0000 (21:24 +0000)]

am 1c88fc00: am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev

* commit '1c88fc009fb3f7a3b5f085abb6a40cf4d845d662':
Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)

commit | commitdiff | tree

Jim Miller [Thu, 4 Dec 2014 21:23:58 +0000 (21:23 +0000)]

am d205d407: am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev

* commit 'd205d407b44b3218579401be4960eda79ce32f67':
Stop keyguard from spamming the log

commit | commitdiff | tree

xinhe [Thu, 4 Dec 2014 21:23:53 +0000 (21:23 +0000)]

am c377c360: am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev

* commit 'c377c360e971b07ccb3c2937f23168c88f426640':
Unable to unlock SIM with a PIN/PUK

commit | commitdiff | tree

Wink Saville [Thu, 4 Dec 2014 21:23:48 +0000 (21:23 +0000)]

am 58a3561f: am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev

* commit '58a3561f74204a3c4cf913169ebc990ca9c0db28':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values

commit | commitdiff | tree

Christopher Tate [Thu, 4 Dec 2014 21:23:43 +0000 (21:23 +0000)]

am dff55807: am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

* commit 'dff55807117f515ff3f8878ed268a20c1fb9e4a5':
Adjust wallpaper-restore acceptance criteria

commit | commitdiff | tree

Winson Chung [Thu, 4 Dec 2014 21:18:01 +0000 (21:18 +0000)]

am 4eb896ef: am ba1307b2: Merge changes Ib255e49f,Ifc33cdf7 into lmp-mr1-dev

* commit '4eb896ef011a8ecfe32f3b4300a42e0cc8b162a8':
Ensuring that the alpha and translation animation durations are the same. (Bug 18609321)
Fix crash when user is both scrolling and tabbing through Recents. (Bug 18552776)

commit | commitdiff | tree

Jim Miller [Thu, 4 Dec 2014 21:17:55 +0000 (21:17 +0000)]

am f2b934b4: am 3ea68240: Merge "Stop keyguard from spamming the log" into lmp-mr1-dev

* commit 'f2b934b42be772d457b3f6e16c95aad1056c502e':
Stop keyguard from spamming the log

commit | commitdiff | tree

xinhe [Thu, 4 Dec 2014 21:17:50 +0000 (21:17 +0000)]

am 9a4472bf: am 8f61e754: Merge "Unable to unlock SIM with a PIN/PUK" into lmp-mr1-dev

* commit '9a4472bf45044082f4fa6d906530f3640761676a':
Unable to unlock SIM with a PIN/PUK

commit | commitdiff | tree

Wink Saville [Thu, 4 Dec 2014 21:17:43 +0000 (21:17 +0000)]

am 0304c529: am 82611e6d: Merge "Add getSimStateForSubscriber and additional SIM_STATE_XXXX values" into lmp-mr1-dev

* commit '0304c529b6a166547aaf104a46bc876780ba7416':
Add getSimStateForSubscriber and additional SIM_STATE_XXXX values

commit | commitdiff | tree

Christopher Tate [Thu, 4 Dec 2014 21:17:37 +0000 (21:17 +0000)]

am e808d2df: am 758f4521: Merge "Adjust wallpaper-restore acceptance criteria" into lmp-mr1-dev

* commit 'e808d2df764ca19c94bdaf5f9b5cd9a311046d98':
Adjust wallpaper-restore acceptance criteria

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:45:16 +0000 (20:45 +0000)]

am 348b03bf: (-s ours) am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '348b03bff44482a3cd004f0aec9b66b721a3b62e':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:45:12 +0000 (20:45 +0000)]

am a79eea5c: (-s ours) am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:45:08 +0000 (20:45 +0000)]

am a786837b: (-s ours) am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

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

commit | commitdiff | tree

Robert Greenwalt [Thu, 4 Dec 2014 20:45:03 +0000 (20:45 +0000)]

am 83c0b096: am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '83c0b096b775e7b39f89c2da1c9a8193555c0178':
Separate voice/data roaming state and type

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 4 Dec 2014 20:44:58 +0000 (20:44 +0000)]

am 431b65d1: am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

* commit '431b65d11fa79ee1acf55e1de0d074fe9913a51d':
Revert "Camera: Add new capability flags as system features as well"

commit | commitdiff | tree

Dianne Hackborn [Thu, 4 Dec 2014 20:44:53 +0000 (20:44 +0000)]

am 3c8a439b: am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

* commit '3c8a439be33932f35b723271cec5cd4210c19221':
Fix issue #17948584: Application crash and phone restart when app...

commit | commitdiff | tree

Alan Viverette [Thu, 4 Dec 2014 20:44:49 +0000 (20:44 +0000)]

am 979ed514: am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

* commit '979ed5140baf4e89d0aaaec39c0c2b8033c401bf':
Slightly more button elevation to match Material spec

commit | commitdiff | tree

Dianne Hackborn [Thu, 4 Dec 2014 20:44:44 +0000 (20:44 +0000)]

am 11bee890: am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev

* commit '11bee890a24b05d099be87b02ea667441e573898':
Fix issue #18607384: Run fstrim after every system update

commit | commitdiff | tree

Yin-Chia Yeh [Thu, 4 Dec 2014 20:44:39 +0000 (20:44 +0000)]

am e168dd28: am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev

* commit 'e168dd28f8fedc921e8b08bdce71c20ab60966ee':
Camera: update antibanding spec

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:24:28 +0000 (20:24 +0000)]

am 2dadff70: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2dadff70d46dd13ba2e51e8ecd5601c6f2f602d3':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:24:11 +0000 (20:24 +0000)]

am 3b05d2bd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '3b05d2bd6fe7a674537dc87aade5673746c96780':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 4 Dec 2014 20:24:01 +0000 (20:24 +0000)]

am 2253b8c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2253b8c576182256139a9b18195aef451f7e134a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Robert Greenwalt [Thu, 4 Dec 2014 20:23:55 +0000 (20:23 +0000)]

am 98f81182: am 647b437d: Merge "Separate voice/data roaming state and type" into lmp-mr1-dev

* commit '98f81182fb61953e0712bd788941710b6ad842c2':
Separate voice/data roaming state and type

commit | commitdiff | tree

Eino-Ville Talvala [Thu, 4 Dec 2014 20:23:45 +0000 (20:23 +0000)]

am 6e21817b: am d23f8b44: Merge "Revert "Camera: Add new capability flags as system features as well"" into lmp-mr1-dev

* commit '6e21817b8ef160fae5e7046745cb11ceab06b2d7':
Revert "Camera: Add new capability flags as system features as well"

commit | commitdiff | tree

Dianne Hackborn [Thu, 4 Dec 2014 20:23:25 +0000 (20:23 +0000)]

am e6333e51: am f696efa2: Merge "Fix issue #17948584: Application crash and phone restart when app..." into lmp-mr1-dev

* commit 'e6333e5188fd4becf7dea286c768f55c3b89d63e':
Fix issue #17948584: Application crash and phone restart when app...

commit | commitdiff | tree

Alan Viverette [Thu, 4 Dec 2014 20:23:18 +0000 (20:23 +0000)]

am 3977137d: am d3adf098: Merge "Slightly more button elevation to match Material spec" into lmp-mr1-dev

* commit '3977137d865637297b4723ec8784d5b97fc316dc':
Slightly more button elevation to match Material spec

commit | commitdiff | tree

Dianne Hackborn [Thu, 4 Dec 2014 20:23:11 +0000 (20:23 +0000)]

am 4c4e4686: am 281f36f5: Merge "Fix issue #18607384: Run fstrim after every system update" into lmp-mr1-dev

* commit '4c4e4686d5de3f22cf4d832c63716d9054b9ad54':
Fix issue #18607384: Run fstrim after every system update

commit | commitdiff | tree

Yin-Chia Yeh [Thu, 4 Dec 2014 20:23:00 +0000 (20:23 +0000)]

am 871571ae: am 38134308: Merge "Camera: update antibanding spec" into lmp-mr1-dev

* commit '871571ae0c4d8f334265b99e274892346756d51b':
Camera: update antibanding spec

commit | commitdiff | tree

Craig Mautner [Thu, 4 Dec 2014 19:59:15 +0000 (19:59 +0000)]

am b3c60bcb: am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

* commit 'b3c60bcb51821116a301a30566b89878ab77d3d0':
Prevent ANR when broadcast receiver is killed

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 4 Dec 2014 19:59:09 +0000 (19:59 +0000)]

am e762f986: am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

* commit 'e762f986c47caf90a4c5e2887ab41818a1c4599e':
Add -Wno-unused-parameter to LOCAL_CFLAGS

commit | commitdiff | tree

Craig Mautner [Thu, 4 Dec 2014 19:51:23 +0000 (19:51 +0000)]

am 6465980c: am e879b2ae: Merge "Prevent ANR when broadcast receiver is killed"

* commit '6465980cd88ea4ed0057bf23867fd3ab8e146dfa':
Prevent ANR when broadcast receiver is killed

commit | commitdiff | tree

Chih-hung Hsieh [Thu, 4 Dec 2014 19:51:15 +0000 (19:51 +0000)]

am 0ebbfaed: am ccce6e0f: Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"

* commit '0ebbfaedd7fd843229d289baa69fffd33eab2985':
Add -Wno-unused-parameter to LOCAL_CFLAGS

commit | commitdiff | tree

Justin Harrison [Thu, 4 Dec 2014 17:44:42 +0000 (17:44 +0000)]

am 21af21ca: Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev

* commit '21af21ca07cd07d7164bf7b7d70513c193785247':
Revert "Improve fling physics for recents"

commit | commitdiff | tree

Justin Harrison [Thu, 4 Dec 2014 17:37:53 +0000 (17:37 +0000)]

Merge "Revert "Improve fling physics for recents"" into lmp-mr1-dev

commit | commitdiff | tree

Justin Harrison [Thu, 4 Dec 2014 17:37:24 +0000 (17:37 +0000)]

Revert "Improve fling physics for recents"

This reverts commit 00d947bda0b9a2ea133dfd7b0e445245a0e2c23c.

Change-Id: I3d6696227a381d232baed8fdbcbe34d3c4976ebe

commit | commitdiff | tree

Svet Ganov [Thu, 4 Dec 2014 17:24:20 +0000 (17:24 +0000)]

Merge "Update accessibility event constants in the service registration XML."

commit | commitdiff | tree

Adam Lesinski [Thu, 4 Dec 2014 16:17:12 +0000 (16:17 +0000)]

am 8e5362f2: am 503071ae: am a2b5067a: Merge "RRO: prevent duplicate system overlays"

* commit '8e5362f20e2bc41b1dcf130a613b7e0b3cd1db58':
RRO: prevent duplicate system overlays

commit | commitdiff | tree

Michael Wright [Thu, 4 Dec 2014 16:16:39 +0000 (16:16 +0000)]

am c0707c00: am 83de9a42: am da79c87f: Merge "Add keylayout for Logitech RedHawk Gamepad DO NO MERGE" into lmp-mr1-dev

* commit 'c0707c007d8322338e9f46f5ccb04b5582e75845':
Add keylayout for Logitech RedHawk Gamepad DO NO MERGE

commit | commitdiff | tree

Michael Wright [Thu, 4 Dec 2014 16:16:34 +0000 (16:16 +0000)]

am fc09908b: (-s ours) am 70d8133c: am 22458842: Merge "Added Razer USA, Ltd serval DO NOT MERGE" into lmp-mr1-dev

* commit 'fc09908b8a583b4aa1b0a059e305dc1356ce6aba':
Added Razer USA, Ltd serval DO NOT MERGE

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 15:27:05 +0000 (15:27 +0000)]

am 54daab10: Merge "Improve fling physics for recents" into lmp-mr1-dev

* commit '54daab1009e7be849fa1dcbf4ee3f9d0ba40d732':
Improve fling physics for recents

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 15:26:59 +0000 (15:26 +0000)]

am 47faf69c: Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev

* commit '47faf69cfdca06cb82176a4b617814fd3e1aac18':
Fix rounded corners in bottom QS panel.

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 15:18:15 +0000 (15:18 +0000)]

Merge "Improve fling physics for recents" into lmp-mr1-dev

commit | commitdiff | tree

Jorim Jaggi [Thu, 4 Dec 2014 15:17:00 +0000 (15:17 +0000)]

Merge "Fix rounded corners in bottom QS panel." into lmp-mr1-dev

commit | commitdiff | tree

Derek Sollenberger [Thu, 4 Dec 2014 15:17:01 +0000 (15:17 +0000)]

am 4d9da135: Merge "Update AndroidPixelRef to prevent VM from cleaning up memory prematurely." into lmp-mr1-dev

* commit '4d9da135caf8d4f38bb728343c1aabbf45f81d5b':
Update AndroidPixelRef to prevent VM from cleaning up memory prematurely.

commit | commitdiff | tree

Christoph Studer [Thu, 4 Dec 2014 15:16:55 +0000 (15:16 +0000)]

am c9660bdf: Merge "RankingHelper: Remove STOPSHIP" into lmp-mr1-dev

* commit 'c9660bdf289ba7ee20854af9de4133df5fb42d92':
RankingHelper: Remove STOPSHIP

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 15:16:49 +0000 (15:16 +0000)]

am 7e168ad0: am 6cbef4bd: am 03af0c42: Merge "Ensure that RandomAccessFile is not leaked." into lmp-dev

* commit '7e168ad04a4553c23bca1e9bd427ba6088493908':
Ensure that RandomAccessFile is not leaked.

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 15:16:44 +0000 (15:16 +0000)]

am 302a7cc1: am 4628d51a: am 141c7614: Merge "Fix AnalogClock rendering" into lmp-dev

* commit '302a7cc13a02863ef2e9d9102df761e92150de65':
Fix AnalogClock rendering

commit | commitdiff | tree

Deepanshu Gupta [Thu, 4 Dec 2014 15:16:37 +0000 (15:16 +0000)]

am b2ded18a: Merge "resolved conflicts for merge of fb30a783 to lmp-mr1-dev" into lmp-mr1-dev

* commit 'b2ded18a84b3b23a76b462644dcd24b3c33f5234':
Fix typos in previous bugfixes.

commit | commitdiff | tree

Jinsuk Kim [Thu, 4 Dec 2014 15:16:32 +0000 (15:16 +0000)]

am f1647395: Merge "CEC: Generate hotplug events upon adding listener" into lmp-mr1-dev

* commit 'f16473951052b1f9eb06753c43b93255452c8838':
CEC: Generate hotplug events upon adding listener