OSDN Git Service
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)
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
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.
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.
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
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: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 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
Baligh Uddin [Sat, 19 Sep 2015 03:07:54 +0000 (03:07 +0000)]
am
861caaa9: (-s ours) am
462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
861caaa9ac3fb5dc8b832bc747fa90b001e5db41':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:46 +0000 (03:07 +0000)]
am
560a1551: (-s ours) am
78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
560a15512fbfdf0fe4801fef0c22079caf94623b':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:39 +0000 (03:07 +0000)]
am
af0c15d7: (-s ours) am
4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
af0c15d7bf3b409a1fa114304ed0c81924f055a6':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:33 +0000 (03:07 +0000)]
am
9f46f1be: (-s ours) am
5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
9f46f1be1305533406549a6ec3150067ab823132':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:26 +0000 (03:07 +0000)]
am
0727c1bd: (-s ours) am
20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
0727c1bdad8b503f868d1becba382c11a4bf4157':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:16 +0000 (03:07 +0000)]
am
684a63f1: (-s ours) am
18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
684a63f169ec3f34aa23e0b47df1158e1d230bcd':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:07:09 +0000 (03:07 +0000)]
am
26d1a338: (-s ours) am
14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
26d1a338431819d3c0ebb4fe7d4eb53e8735fc10':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:06:58 +0000 (03:06 +0000)]
am
2f52c65c: (-s ours) am
39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2f52c65c72e16f82bcf2f18ffef5375f4382abb1':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:06:52 +0000 (03:06 +0000)]
am
06f02f3e: (-s ours) am
dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
06f02f3e14474aab5d4994e4603eda5a54180b13':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:06:45 +0000 (03:06 +0000)]
am
40507863: (-s ours) am
5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4050786337de85f81735835117222987a4772dc9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:06:37 +0000 (03:06 +0000)]
am
27afa63a: (-s ours) am
396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
27afa63a9d336ea8740d7bb9014a3a0b65d32b45':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 03:06:30 +0000 (03:06 +0000)]
am
075a4c9c: (-s ours) am
6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
075a4c9c54566f3125b16bf652d9d2a2c67c6a8e':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:57:13 +0000 (02:57 +0000)]
am
c488631e: (-s ours) am
cbf24e12: (-s ours) am
2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
c488631ef09849b8c054cab26c463a2be260adf0':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:57:06 +0000 (02:57 +0000)]
am
d159a208: (-s ours) am
a64c3e57: (-s ours) am
ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
d159a208a4f1dbec522d8a0a5045a96fbe6d0082':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:57 +0000 (02:56 +0000)]
am
7bd7a242: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
7bd7a2426466a01c94b2d12a1fa10e038249473b':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:52 +0000 (02:56 +0000)]
am
462c76f1: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
462c76f129bd2633ddb01db3ed9d45d2ea2f84d9':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:49 +0000 (02:56 +0000)]
am
78ef803f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
78ef803faf8cf780d9c2f232c73f24f0990fe6d1':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:44 +0000 (02:56 +0000)]
am
4cfcdac0: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
4cfcdac0fba42eb6d7faef7ab8f1188204e6508f':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:39 +0000 (02:56 +0000)]
am
5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5eed30f30c0476411a51d97c411a62b72d5861b5':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:35 +0000 (02:56 +0000)]
am
20094d70: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
20094d70ac08db3bbdcf363cb3bd1e4550ab8d23':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:30 +0000 (02:56 +0000)]
am
18b2419d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
18b2419d991cce0328db13696436102bbce0d8ff':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:25 +0000 (02:56 +0000)]
am
14d7a10a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
14d7a10a805e6eb9849a9871d5a90c0fb5a24e35':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:19 +0000 (02:56 +0000)]
am
39dc2f31: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
39dc2f31563901b0d81d89ce1b65e2c4d41eec9f':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:14 +0000 (02:56 +0000)]
am
dc6c5277: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
dc6c52779ff39486f8dd3c367a7b0040396c81fa':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:10 +0000 (02:56 +0000)]
am
5aecb21d: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
5aecb21d8b2a4841a60d1ab49ef9ee687ae63b30':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:05 +0000 (02:56 +0000)]
am
396c4a73: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
396c4a7345f999713314ced12f99148846f849d6':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:56:01 +0000 (02:56 +0000)]
am
6fad59a4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
6fad59a41ad383b5010c565da3d284c29aea8183':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:49:16 +0000 (02:49 +0000)]
am
cbf24e12: (-s ours) am
2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
cbf24e129cb30bdac485e9e22c2c835f940df4bc':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:49:07 +0000 (02:49 +0000)]
am
a64c3e57: (-s ours) am
ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
a64c3e57baeec6f3b7ce70d098a81c3b33dc5f55':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:45:29 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:45:16 +0000 (02:45 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:50 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:47 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:44 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:42 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:39 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:35 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:31 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:28 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:25 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:44:23 +0000 (02:44 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:43:21 +0000 (02:43 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:41:33 +0000 (02:41 +0000)]
am
2deb87d4: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
2deb87d4dfefb7571f54d9d631729cfb20c9fa55':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:41:30 +0000 (02:41 +0000)]
am
ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '
ce992f1b580b6cf55fc6f5992e5037ba616cd1f3':
Import translations. DO NOT MERGE
Baligh Uddin [Sat, 19 Sep 2015 02:35:14 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Baligh Uddin [Sat, 19 Sep 2015 02:35:12 +0000 (02:35 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Justin Harrison [Sat, 19 Sep 2015 00:46:19 +0000 (00:46 +0000)]
am
08b00423: am
1f463957: am
91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '
08b004233537f625044b3f01e2923b600a9aa77c':
Add support for setting color transforms
Tim Kilbourn [Sat, 19 Sep 2015 00:46:13 +0000 (00:46 +0000)]
am
0c4050b0: am
bdfbd821: am
0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev
* commit '
0c4050b09b433f39bcbe612fb000b5fb5d396bd0':
Always set the usb config when modifying it.
Justin Harrison [Sat, 19 Sep 2015 00:37:52 +0000 (00:37 +0000)]
am
1f463957: am
91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '
1f46395702f609d90909df39ab990844c0731952':
Add support for setting color transforms
Tim Kilbourn [Sat, 19 Sep 2015 00:37:46 +0000 (00:37 +0000)]
am
bdfbd821: am
0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev
* commit '
bdfbd82154b58592597a70064c0806d774446746':
Always set the usb config when modifying it.
Justin Harrison [Sat, 19 Sep 2015 00:29:40 +0000 (00:29 +0000)]
am
91f2123b: Merge "Add support for setting color transforms" into mnc-dr-dev
* commit '
91f2123b2a6d534372ab9b7c8e6ac0c62cf33ae6':
Add support for setting color transforms
Tim Kilbourn [Sat, 19 Sep 2015 00:29:35 +0000 (00:29 +0000)]
am
0eb10ede: Merge "Always set the usb config when modifying it." into mnc-dr-dev
* commit '
0eb10ede2364bf975721d95f7af7a1e4f4b617f8':
Always set the usb config when modifying it.
Vineeta Srivastava [Sat, 19 Sep 2015 00:23:08 +0000 (00:23 +0000)]
am
1762a44f: am
7e765dd7: am
22fe39b4: Merge "set config_use_sim_language_file false for SE Telia/Sweden 3G" into mnc-dr-dev
* commit '
1762a44f9f31e5bdeb2f5d96e77c25d46763837b':
set config_use_sim_language_file false for SE Telia/Sweden 3G
Adam Lesinski [Sat, 19 Sep 2015 00:23:02 +0000 (00:23 +0000)]
am
3bdbda78: am
dd0238ec: am
e54253bd: Merge "Fix crash when no power_profile is specified" into mnc-dr-dev
* commit '
3bdbda780613e1701e4e3e567be8a743a8dedb8f':
Fix crash when no power_profile is specified
Justin Harrison [Sat, 19 Sep 2015 00:21:41 +0000 (00:21 +0000)]
Merge "Add support for setting color transforms" into mnc-dr-dev
Tim Kilbourn [Fri, 18 Sep 2015 23:55:56 +0000 (23:55 +0000)]
Merge "Always set the usb config when modifying it." into mnc-dr-dev
Michael Wright [Mon, 14 Sep 2015 23:13:26 +0000 (00:13 +0100)]
Add support for setting color transforms
Bug:
24038268
Change-Id: I05275c906e02eb9e67331f6f909166eb08ad5536
OSDN Git Service
