OSDN Git Service
Alan Viverette [Tue, 22 Sep 2015 20:21:35 +0000 (20:21 +0000)]
Merge "Allow color state list for vector drawable fill and stroke"
Diego Perez [Tue, 22 Sep 2015 20:05:30 +0000 (20:05 +0000)]
am
36152328: am
0e766de7: Avoid calling scrollBy(0,0) on render
* commit '
361523281c88a7e453e0eef961ed7f16a55785a5':
Avoid calling scrollBy(0,0) on render
Elliott Hughes [Tue, 22 Sep 2015 20:04:29 +0000 (20:04 +0000)]
am
776fa57b: am
aa311698: am
0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '
776fa57b2da75fb508d66cf0339dc7c4df9a5e55':
WrapperInit: remove dead execStandalone method
Todd Kennedy [Tue, 22 Sep 2015 20:03:43 +0000 (20:03 +0000)]
am
d65fc9c4: (-s ours) am
d8b47855: save "retain loader" state DO NOT MERGE
* commit '
d65fc9c4601f3fc5617ff0f72fcdb56581f0f223':
save "retain loader" state DO NOT MERGE
Alan Viverette [Tue, 22 Sep 2015 19:03:50 +0000 (15:03 -0400)]
Allow color state list for vector drawable fill and stroke
Removes unnecessary invalidateSelf() from VD.onStateChange(). This is
handled by the view hosting the drawable.
Bug:
22984152
Change-Id: Idf11a0ffef392cb1d8452aa3f5f836b35027a756
Diego Perez [Tue, 22 Sep 2015 16:56:35 +0000 (16:56 +0000)]
am
0e766de7: Avoid calling scrollBy(0,0) on render
* commit '
0e766de7c52d7e375e04676c93a872cb2d6eea63':
Avoid calling scrollBy(0,0) on render
Diego Perez [Tue, 22 Sep 2015 10:08:35 +0000 (11:08 +0100)]
Avoid calling scrollBy(0,0) on render
Usually scrollBy(0, 0) won't have any effect but when called on the
NumberPicker but, in some cases, it seems to cause an endless loop.
When called from layoutlib, this will hold the read lock causing all
operations trying to acquire the write lock to block forever.
Bug: http://b.android.com/182506
Change-Id: Ib25427d3f32d804d1c481d979795eee71fbdbc6d
Elliott Hughes [Tue, 22 Sep 2015 15:50:09 +0000 (15:50 +0000)]
am
aa311698: am
0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '
aa31169804dffa3b36654ccffe67a53f6ff4cdaf':
WrapperInit: remove dead execStandalone method
Elliott Hughes [Tue, 22 Sep 2015 15:42:36 +0000 (15:42 +0000)]
am
0361b18e: Merge "WrapperInit: remove dead execStandalone method"
* commit '
0361b18ea10aa7987dbf8c4217d5f4c7e3a4a610':
WrapperInit: remove dead execStandalone method
Elliott Hughes [Tue, 22 Sep 2015 15:34:26 +0000 (15:34 +0000)]
Merge "WrapperInit: remove dead execStandalone method"
Alan Viverette [Tue, 22 Sep 2015 13:48:04 +0000 (13:48 +0000)]
Merge "SubMenuBuilder.getRootMenu() should return root menu, not parent"
Todd Kennedy [Tue, 22 Sep 2015 07:27:18 +0000 (07:27 +0000)]
am
d8b47855: save "retain loader" state DO NOT MERGE
* commit '
d8b47855a316700751f7daead0b180005853be33':
save "retain loader" state DO NOT MERGE
Todd Kennedy [Thu, 10 Sep 2015 20:58:01 +0000 (13:58 -0700)]
save "retain loader" state DO NOT MERGE
We cannot pull the "retain loader" state from the Activity; an Activity may
not always be hosting a Fragment. Instead, save the "retain loader" state
inside the individual fragments.
Bug:
23838271
Change-Id: I8358183a7689b5a571ea7be03d769186b2812600
(cherry picked from commit
c5ac16f531504d5bde7c87f8e3088652daeb543f)
Chong Zhang [Mon, 21 Sep 2015 22:39:51 +0000 (15:39 -0700)]
Change resizeTask's parameter resizedByUser to constants
to indicate who initiated the resize, or if the resize should be forced.
Change-Id: Ic7021f76bec677027cbf27deeb63f92ea911a75c
Filip Gruszczynski [Mon, 21 Sep 2015 23:52:04 +0000 (23:52 +0000)]
Merge "Split PhoneWindowManager.beginLayoutLw."
Chris Craik [Mon, 21 Sep 2015 23:21:04 +0000 (23:21 +0000)]
Merge "Remove legacy enable/disable methods from Blend"
Chris Craik [Mon, 21 Sep 2015 23:19:42 +0000 (23:19 +0000)]
Merge "Remove unnecessary glop color storage"
Chris Craik [Mon, 21 Sep 2015 23:16:22 +0000 (16:16 -0700)]
Remove unnecessary glop color storage
Change-Id: I68817449d2e0d593dccb7e9be8c8ca45b7ab2fc2
Chris Craik [Mon, 21 Sep 2015 22:59:55 +0000 (15:59 -0700)]
Remove legacy enable/disable methods from Blend
Change-Id: I147f96d1fbdd34b9d056620e7259a9f96b13fea7
Chong Zhang [Mon, 21 Sep 2015 22:59:02 +0000 (22:59 +0000)]
Merge "Misc fixes for window moving and resizing"
Chong Zhang [Sat, 19 Sep 2015 01:46:28 +0000 (18:46 -0700)]
Misc fixes for window moving and resizing
- Do not skip resizeTask if we're starting or ending drag. We need
the relayout because surface mode is changing.
- When we're changing the surface mode, need to wait for the first
draw to finish before we can modify shown frame. Otherwise there
could be 1 old frame displayed with new position, which makes the
window position look a bit off.
- Clean up dragResizing/dragResizeChanged flags.
Change-Id: Ia396d6b88fd616ad57aa8cd24ca7e1161add7205
Daniel Micay [Mon, 21 Sep 2015 22:14:56 +0000 (18:14 -0400)]
WrapperInit: remove dead execStandalone method
This became dead with the removal of support for the non-runtime-init
code path in
f48029f00a66e23d7872a00b56fbcf88528ba476.
Change-Id: Id68e0da4658e83f0d3bfd8645152165faacac5fa
Toni Barzic [Mon, 21 Sep 2015 22:13:26 +0000 (22:13 +0000)]
Merge "Read autoclick delay from settings"
Zach Jang [Mon, 21 Sep 2015 22:09:47 +0000 (22:09 +0000)]
am
01ce0783: (-s ours) am
5695a7f6: am
ef44f99d: am
88f92ec5: am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Setting
* commit '
01ce078379715047b767c11a8181599c85a58c74':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 22:09:39 +0000 (22:09 +0000)]
am
5d05906d: (-s ours) am
3a273f45: am
4a9ccd15: am
c53f18b7: am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
5d05906d56ef9f118a7b6f6979ed4b7b9c31a575':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Chong Zhang [Mon, 21 Sep 2015 22:09:10 +0000 (22:09 +0000)]
Merge "Do not do setSurface on window size changes"
Stefan Kuhne [Mon, 21 Sep 2015 22:08:30 +0000 (22:08 +0000)]
Merge "MultiThreaded rendering of different renderNodes"
Zach Jang [Mon, 21 Sep 2015 22:02:36 +0000 (22:02 +0000)]
am
5695a7f6: am
ef44f99d: am
88f92ec5: am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
5695a7f6402aef65f5f4a90a2a833446168ea999':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 22:02:29 +0000 (22:02 +0000)]
am
3a273f45: am
4a9ccd15: am
c53f18b7: am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
3a273f457cd045dcd8ea30f75d0704607499d60f':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:52:55 +0000 (21:52 +0000)]
am
ef44f99d: am
88f92ec5: am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
ef44f99d90e81de4dff92d7cdbdb58e6b38fcbd4':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:52:49 +0000 (21:52 +0000)]
am
4a9ccd15: am
c53f18b7: am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
4a9ccd15bd42cfb600d180ae6b7a5ddbebaffc59':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Jeff Sharkey [Mon, 21 Sep 2015 21:47:35 +0000 (21:47 +0000)]
am
e1964182: am
9314f94b: am
b7b17fa6: am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
e1964182de52d00950219810798ea4e7900fb57b':
Relax locking when scanning private volumes.
Zach Jang [Mon, 21 Sep 2015 21:45:09 +0000 (21:45 +0000)]
am
88f92ec5: am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
88f92ec5a76c94dcb084ffcc8a4fc36a66bb9ca2':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:45:05 +0000 (21:45 +0000)]
am
c53f18b7: am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
c53f18b7b3cea030983e23fbf0d49dfcda77b249':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Jeff Sharkey [Mon, 21 Sep 2015 21:39:01 +0000 (21:39 +0000)]
am
9314f94b: am
b7b17fa6: am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
9314f94b687deb21acd7f05810d3edf1a4e8fcbc':
Relax locking when scanning private volumes.
Zach Jang [Mon, 21 Sep 2015 21:37:34 +0000 (21:37 +0000)]
am
fed28546: am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
fed2854653d7e9d596cf1d9cb9c41ff05e744e94':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:37:30 +0000 (21:37 +0000)]
am
937141cb: am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
937141cb75160a1a51b9568481225aec286c5a86':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:30:32 +0000 (21:30 +0000)]
am
3e344f3f: (-s ours) am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
3e344f3fcb66f3e94a3b5436d5901dec0b94cbb3':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:30:27 +0000 (21:30 +0000)]
am
0cae8381: (-s ours) am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
0cae8381666248e44875756e72998e55ed3f9151':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:07:04 +0000 (21:07 +0000)]
am
ba80596b: am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
ba80596bc0d51b3ddf14c1612c341992bc3ac5fc':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 21:06:58 +0000 (21:06 +0000)]
am
b5173241: am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
b5173241d160a5b6f4d440a01c9a9b0281ee4e66':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Jeff Sharkey [Mon, 21 Sep 2015 20:48:56 +0000 (20:48 +0000)]
am
b7b17fa6: am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
b7b17fa6a14a6916f12568f02360a1ec1792f256':
Relax locking when scanning private volumes.
Chong Zhang [Mon, 21 Sep 2015 20:25:58 +0000 (13:25 -0700)]
Do not do setSurface on window size changes
Surface should only be invalidated when surface generation changed
(which we're already doing). Window size change doesn't always imply
a surface change. During a drag-resizing action, the window size is
constantly changing but the surface remains the same. setSurface
could take 12ms+ each frame and cause frame drops.
bug:
23793966
Change-Id: Iac0456122e8916cf06b1a7a0940584ab4bf4065d
Chris Craik [Mon, 21 Sep 2015 20:43:23 +0000 (20:43 +0000)]
Merge "Unify extensions parsing behavior"
Jeff Sharkey [Mon, 21 Sep 2015 20:40:08 +0000 (20:40 +0000)]
am
281a868c: am
e1a6299b: Relax locking when scanning private volumes.
* commit '
281a868c69e0915efc16eb3c65f669bbf0df69df':
Relax locking when scanning private volumes.
Jeff Sharkey [Mon, 21 Sep 2015 20:29:58 +0000 (20:29 +0000)]
am
e1a6299b: Relax locking when scanning private volumes.
* commit '
e1a6299b994bbdb304550e00d5b3b26a064bdf0c':
Relax locking when scanning private volumes.
Todd Kennedy [Mon, 21 Sep 2015 20:18:58 +0000 (20:18 +0000)]
Merge "save "retain loader" state"
Chris Craik [Mon, 14 Sep 2015 22:54:12 +0000 (15:54 -0700)]
Unify extensions parsing behavior
Removes remnants of EGL extension support, and persistence of
GL extension list.
Change-Id: I35aec12d900bdb33549ea47654bb8146f350ef48
Zach Jang [Mon, 21 Sep 2015 19:10:51 +0000 (19:10 +0000)]
am
f8cda089: am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
f8cda08986a5caa14daace69e24c82224ac5a9fc':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 19:10:46 +0000 (19:10 +0000)]
am
e54c195a: am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
e54c195a53694696e0913722fa721c882e33753e':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 18:58:27 +0000 (18:58 +0000)]
am
b2b3cecb: am
7b5bf993: am
fe4cbf2b: (-s ours) am
cff4e09e: am
bdf7f358: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
b2b3cecbd3de80d40f8c207c6aa94532c3426829':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Zach Jang [Mon, 21 Sep 2015 18:58:18 +0000 (18:58 +0000)]
am
0a8197b1: am
1cf21e44: DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
* commit '
0a8197b1e43bc3771fc3f8595619603ec8f6f641':
DO NOT MERGE - Backport of ag/748165 to klp-dev Security patch level in Settings
Todd Kennedy [Mon, 21 Sep 2015 18:01:26 +0000 (18:01 +0000)]
Merge "Save Fragment's hidden state"
Toni Barzic [Thu, 10 Sep 2015 23:40:04 +0000 (16:40 -0700)]
Read autoclick delay from settings
Instead of hardcoding autoclick delay, use
Settings.Secure.ACCESSIBILITY_AUTOCLICK_DELAY value.
Adds logic for observing the setting's changes and updating the delay
that should be used when scheduling automatical click.
BUG=
23113412
Change-Id: Iffe3df0cb64ab28f13d2803d01d581280aedf422
Rob Carr [Mon, 21 Sep 2015 17:33:39 +0000 (17:33 +0000)]
Merge "Enforce a timeout for Content Providers to be published."
Matthew Dempsky [Mon, 21 Sep 2015 16:30:32 +0000 (16:30 +0000)]
Merge "Eliminate uses of Skia's SkDELETE macro"
Gus Prevas [Mon, 21 Sep 2015 14:41:19 +0000 (10:41 -0400)]
Resolved conflicts for
31bd01a1 to master.
Change-Id: I469d2e884831c38731b1de2604179fcdcea67ddb
Skuhne [Fri, 28 Aug 2015 14:10:31 +0000 (07:10 -0700)]
MultiThreaded rendering of different renderNodes
This is adding the renderer side infrastructure to allow
rendering multiple render nodes with different threads.
This is a pre-step for decoupling a non client decor
resize reder from a content resize render.
Multiple render nodes can be added to be drawn, and to
prevent overdrawing, a content bounds area can be set
Bug:
22527834
Change-Id: Ie7271e20895bf38957e5a84aeefc883e282039ad
Gus Prevas [Mon, 21 Sep 2015 14:17:13 +0000 (14:17 +0000)]
am
448ada62: am
1f66ec8b: Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev
* commit '
448ada6286b5c3d172431ecf51ff3cd071c98c41':
Allows starting window to be shown for swipe-dismiss windows.
Gus Prevas [Mon, 21 Sep 2015 14:08:50 +0000 (14:08 +0000)]
am
1f66ec8b: Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev
* commit '
1f66ec8b908bb37c342c8bf97f74ecce913bfcc3':
Allows starting window to be shown for swipe-dismiss windows.
Gus Prevas [Mon, 21 Sep 2015 14:02:43 +0000 (14:02 +0000)]
Merge "Allows starting window to be shown for swipe-dismiss windows." into cw-e-dev
Erik Kline [Mon, 21 Sep 2015 12:21:24 +0000 (12:21 +0000)]
am
5bcd4477: am
2a068606: am
c89f3a48: am
7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '
5bcd4477ddeeec3ccf334a3ab6e48f5e809622f8':
Grab a wakelock while doing ARP/ND probing
Erik Kline [Mon, 21 Sep 2015 12:15:39 +0000 (12:15 +0000)]
am
2a068606: am
c89f3a48: am
7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '
2a06860609254ab07ac7c866d8a7435a4245a9f0':
Grab a wakelock while doing ARP/ND probing
Erik Kline [Mon, 21 Sep 2015 12:09:06 +0000 (12:09 +0000)]
am
c89f3a48: am
7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '
c89f3a483330498d69a6c706b78c3a0aea5298a0':
Grab a wakelock while doing ARP/ND probing
Erik Kline [Mon, 21 Sep 2015 12:00:25 +0000 (12:00 +0000)]
am
7aa79efe: Grab a wakelock while doing ARP/ND probing
* commit '
7aa79efe80b790eef61ac355c0ce6c7b606e6f78':
Grab a wakelock while doing ARP/ND probing
Erik Kline [Fri, 18 Sep 2015 03:21:56 +0000 (12:21 +0900)]
Grab a wakelock while doing ARP/ND probing
Bug:
23197666
Change-Id: I5bf6e83b37fcd924f5f8e750f65bb5061f931e56
Baligh Uddin [Sat, 19 Sep 2015 18:17:46 +0000 (18:17 +0000)]
am
4fb221df: (-s ours) am
5c3ea10c: (-s ours) am
331c3ec7: (-s ours) am
7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4fb221dfab8822ca1ef22dcde501526bfa1f4b65':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:39 +0000 (18:17 +0000)]
am
fc47b77e: (-s ours) am
957457a8: (-s ours) am
861caaa9: (-s ours) am
462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fc47b77e0561735486c493127e2607a7719381a7':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:33 +0000 (18:17 +0000)]
am
544a2885: (-s ours) am
54368ed0: (-s ours) am
560a1551: (-s ours) am
78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
544a2885838e38f4465d768c180b5d71ce5ff0ee':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:26 +0000 (18:17 +0000)]
am
b91fa390: (-s ours) am
2434a36d: (-s ours) am
af0c15d7: (-s ours) am
4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
b91fa39075e466f81748b2c69f2c1189a41d3bbf':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:20 +0000 (18:17 +0000)]
am
84b22cd7: (-s ours) am
e97d2b1c: (-s ours) am
9f46f1be: (-s ours) am
5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
84b22cd7df7691e8ab73254b7a0a729db112e990':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:13 +0000 (18:17 +0000)]
am
4fb39dbd: (-s ours) am
042567fe: (-s ours) am
0727c1bd: (-s ours) am
20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4fb39dbdaac7983ce1962b7f6c14353630ecf933':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:17:06 +0000 (18:17 +0000)]
am
bb22aa89: (-s ours) am
3eb0ccbd: (-s ours) am
684a63f1: (-s ours) am
18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
bb22aa897d8ecea9eb989ba720e390a3934e851a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:59 +0000 (18:16 +0000)]
am
99854983: (-s ours) am
d542fb05: (-s ours) am
26d1a338: (-s ours) am
14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
99854983bc8c57fb56cde595ccc0dba0ac30a6bf':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:52 +0000 (18:16 +0000)]
am
2ab06bfe: (-s ours) am
d88b1437: (-s ours) am
2f52c65c: (-s ours) am
39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2ab06bfe054178c708742376a6cadc0f49410a93':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:46 +0000 (18:16 +0000)]
am
d3958df3: (-s ours) am
57e83d53: (-s ours) am
06f02f3e: (-s ours) am
dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d3958df3bc1deee06807dd33385a85532cf7b92d':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:39 +0000 (18:16 +0000)]
am
dd21d7f1: (-s ours) am
8ac40507: (-s ours) am
40507863: (-s ours) am
5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
dd21d7f131f92bfc095887d463a358124a15dc0a':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:32 +0000 (18:16 +0000)]
am
fc32932d: (-s ours) am
57861323: (-s ours) am
27afa63a: (-s ours) am
396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
fc32932d5037a2c1709df262fa587b959b20be16':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:16:24 +0000 (18:16 +0000)]
am
dc612a0b: (-s ours) am
3c25fc89: (-s ours) am
075a4c9c: (-s ours) am
6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
dc612a0b8b821926dda00ee1d420031b504e324b':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:15:47 +0000 (18:15 +0000)]
am
b22c59e2: (-s ours) am
c488631e: (-s ours) am
cbf24e12: (-s ours) am
2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
b22c59e2f60e96e7ff2166ea657963c35cf7f29c':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 18:15:39 +0000 (18:15 +0000)]
am
793f4287: (-s ours) am
d159a208: (-s ours) am
a64c3e57: (-s ours) am
ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
793f42875c105ac9f57695b28cfd2b2ae159d157':
Import translations. DO NOT MERGE
Justin Harrison [Sat, 19 Sep 2015 18:14:55 +0000 (18:14 +0000)]
am
46db0f22: am
08b00423: am
1f463957: am
91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '
46db0f2215ad6e969418d1fedd1578445b46588f':
Add support for setting color transforms
Tim Kilbourn [Sat, 19 Sep 2015 18:14:47 +0000 (18:14 +0000)]
am
880c6010: am
0c4050b0: am
bdfbd821: am
0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev
* commit '
880c601013e3b58f004f65c6cacfb8e19e2ca863':
Always set the usb config when modifying it.
Vineeta Srivastava [Sat, 19 Sep 2015 15:35:17 +0000 (15:35 +0000)]
am
2a554841: am
1762a44f: am
7e765dd7: am
22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
* commit '
2a554841f3fcaf548b790f7230ead121f1c5b942':
set config_use_sim_language_file false for SE Telia/Sweden 3G
Adam Lesinski [Sat, 19 Sep 2015 15:35:09 +0000 (15:35 +0000)]
am
eb1356cc: am
3bdbda78: am
dd0238ec: am
e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit '
eb1356cc15d4c07e152b5dbc545701c496d7b50f':
Fix crash when no power_profile is specified
Christine Hallstrom [Sat, 19 Sep 2015 15:34:31 +0000 (15:34 +0000)]
am
c4f196b6: am
039fd00f: am
13c23df9: Merge "Manual \'cherry pick\' to fix CTS tests for MediaControllerTest." into cw-e-dev
* commit '
c4f196b661cb9d38f74fa7a1a5a4abb921980387':
Manual 'cherry pick' to fix CTS tests for MediaControllerTest.
Baligh Uddin [Sat, 19 Sep 2015 03:18:35 +0000 (03:18 +0000)]
am
5c3ea10c: (-s ours) am
331c3ec7: (-s ours) am
7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5c3ea10c7ba46e33284ceb4d363e4a304dabc131':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:18:29 +0000 (03:18 +0000)]
am
957457a8: (-s ours) am
861caaa9: (-s ours) am
462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
957457a8fac025b7a75669d48291be1a0f9c4450':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:18:23 +0000 (03:18 +0000)]
am
54368ed0: (-s ours) am
560a1551: (-s ours) am
78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
54368ed0c2cde9172687a1b55d017243dfd1748b':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:18:16 +0000 (03:18 +0000)]
am
2434a36d: (-s ours) am
af0c15d7: (-s ours) am
4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2434a36da2a491fa30aa81921207d633bee508a8':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:18:07 +0000 (03:18 +0000)]
am
e97d2b1c: (-s ours) am
9f46f1be: (-s ours) am
5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
e97d2b1c55ad240db3f2b46c2b5849ecd2236c18':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:18:01 +0000 (03:18 +0000)]
am
042567fe: (-s ours) am
0727c1bd: (-s ours) am
20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
042567fe796b305c04470c02e0b91ac2871adb1c':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:55 +0000 (03:17 +0000)]
am
3eb0ccbd: (-s ours) am
684a63f1: (-s ours) am
18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
3eb0ccbde558f9fccbc3c880fa00a9579ffdaa04':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:48 +0000 (03:17 +0000)]
am
d542fb05: (-s ours) am
26d1a338: (-s ours) am
14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d542fb052e939b6f1510debef5f8e5cc60dd21df':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:43 +0000 (03:17 +0000)]
am
d88b1437: (-s ours) am
2f52c65c: (-s ours) am
39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d88b143705da74c489d109a457cbad3312bfab10':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:37 +0000 (03:17 +0000)]
am
57e83d53: (-s ours) am
06f02f3e: (-s ours) am
dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
57e83d535255ac6e29213bf753425169a9641dea':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:32 +0000 (03:17 +0000)]
am
8ac40507: (-s ours) am
40507863: (-s ours) am
5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
8ac405074d1a66ab33620dd5bdbb07c5831cb113':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:26 +0000 (03:17 +0000)]
am
57861323: (-s ours) am
27afa63a: (-s ours) am
396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
57861323e934525b191434367318a107355cda91':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:17:20 +0000 (03:17 +0000)]
am
3c25fc89: (-s ours) am
075a4c9c: (-s ours) am
6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
3c25fc89fea8b794f9251a015351f048b2a796cd':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:08:01 +0000 (03:08 +0000)]
am
331c3ec7: (-s ours) am
7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
331c3ec7835044aa9bc6da22bae71695920aae62':
Import translations. DO NOT MERGE
OSDN Git Service
