OSDN Git Service
TreeHugger Robot [Wed, 12 Jul 2017 23:05:58 +0000 (23:05 +0000)]
Merge "UI refresh on bluetooth list page"
jackqdyulei [Wed, 12 Jul 2017 22:28:28 +0000 (22:28 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev am:
0e467d594e
am:
ba757bb235
Change-Id: I64e8378be62775844191b8394cae203c58e4b2fd
jackqdyulei [Wed, 12 Jul 2017 22:26:28 +0000 (22:26 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
am:
0e467d594e
Change-Id: I692d1064b16ed98104eed14ec57caa250e2a703c
TreeHugger Robot [Wed, 12 Jul 2017 22:20:00 +0000 (22:20 +0000)]
Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev
Rajeev Kumar [Wed, 12 Jul 2017 20:53:52 +0000 (20:53 +0000)]
Merge "Data plans setting peference."
Salvador Martinez [Wed, 12 Jul 2017 20:49:51 +0000 (20:49 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev am:
ab2d96de83
am:
96e4b8f9f4
Change-Id: I751d0464ce85d6838bd045cbc431f3dc4c3b1405
Salvador Martinez [Wed, 12 Jul 2017 20:47:14 +0000 (20:47 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev
am:
ab2d96de83
Change-Id: I3514020da43434388b8be25a281c28d3d3b6deea
TreeHugger Robot [Wed, 12 Jul 2017 20:41:27 +0000 (20:41 +0000)]
Merge "Fix mistake in conditional + test" into oc-dr1-dev
Fan Zhang [Wed, 12 Jul 2017 17:18:54 +0000 (10:18 -0700)]
UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref
Change-Id: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Bug:
62890841
Bug:
62891178
Test: robotests
Ajay Nadathur [Wed, 12 Jul 2017 20:09:22 +0000 (20:09 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev am:
d1bac25518
am:
4aaa52d1d6
Change-Id: Ib8d8d766bccd6ce1d91ecdb752fc2581edb50898
Ajay Nadathur [Wed, 12 Jul 2017 20:07:19 +0000 (20:07 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
am:
d1bac25518
Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
TreeHugger Robot [Wed, 12 Jul 2017 20:03:14 +0000 (20:03 +0000)]
Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
jackqdyulei [Wed, 12 Jul 2017 19:30:02 +0000 (12:30 -0700)]
Fix bug in DevicePickerFragment
BluetoothProgressCategory will add a no device preference if it is
not scanning and no device is added to the list. Since
DeviceListFragment doesn't report its scanning status correctly, it will
show "No nearby device" even though it is scanning.
This cl add control code for BluetoothProgressCategory in
DeviceListFragment, which avoid the unnecessary no device preference.
Bug:
62492822
Test: RunSettingsRoboTests
Change-Id: Ic49f21cb58a80dcd37c5737800181263ae876ebc
TreeHugger Robot [Wed, 12 Jul 2017 19:34:54 +0000 (19:34 +0000)]
Merge "Disable lift-to-wake when always-on is checked"
Rajeev Kumar [Tue, 11 Jul 2017 22:44:46 +0000 (15:44 -0700)]
Data plans setting peference.
Change-Id: Ieb2aa67ab98140aa90501227345a15ad64cf124c
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: make RunSettingsRoboTests -j40
Salvador Martinez [Tue, 11 Jul 2017 23:15:44 +0000 (16:15 -0700)]
Fix mistake in conditional + test
This CL fixes a mixup that was in a conditional that determined
what was shown on the battery settings page. Additionally, it adds
a simple test to help ensure that this does not regress in the
future.
Test: Robotest
Bug:
63158794
Change-Id: I8af4843ef6d798b5114c97b2f1b99dd29fa5f412
Ajay Nadathur [Wed, 12 Jul 2017 18:11:47 +0000 (18:11 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev am:
0bde6dcb18
am:
3d627974d6
Change-Id: Ib062bcdfc23008dab14622e4741fca6dc30e5950
Ajay Nadathur [Wed, 12 Jul 2017 18:04:26 +0000 (18:04 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
am:
0bde6dcb18
Change-Id: I7b2ba35b04f53e28ad98eec54b8fe42811a6eb8d
Ajay Nadathur [Wed, 12 Jul 2017 17:53:07 +0000 (17:53 +0000)]
Merge "Do not show options if screen lock types is empty" into oc-dr1-dev
Geoffrey Pitsch [Mon, 10 Jul 2017 14:30:05 +0000 (10:30 -0400)]
Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:
62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
Daniel Nishi [Wed, 12 Jul 2017 17:33:32 +0000 (17:33 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev am:
bce83f8c71
am:
eba886f045
Change-Id: Ib1b6f17ef73222cfeebe163c6a43112f74ffa898
Daniel Nishi [Wed, 12 Jul 2017 17:26:57 +0000 (17:26 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
am:
bce83f8c71
Change-Id: I9ab99b706f8d545294ebacc5e204d90e94c9ea32
Geoffrey Pitsch [Wed, 12 Jul 2017 17:14:54 +0000 (17:14 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev am:
00ac782f3e
am:
329bab9e1b -s ours
Change-Id: I8c12da6716c37f68e253b504e14755ada40a9e2e
Daniel Nishi [Wed, 12 Jul 2017 17:13:46 +0000 (17:13 +0000)]
Merge "Fix filter bug for non-internal app filtering." into oc-dr1-dev
Geoffrey Pitsch [Wed, 12 Jul 2017 16:59:26 +0000 (16:59 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
am:
00ac782f3e
Change-Id: I5151ab5ba2ed2dfb94460a118705b3f68a18f777
TreeHugger Robot [Wed, 12 Jul 2017 16:59:24 +0000 (16:59 +0000)]
Merge "Use pref controller to get non-indexable in network setting"
Geoffrey Pitsch [Wed, 12 Jul 2017 16:50:48 +0000 (16:50 +0000)]
Merge "Disable lift-to-wake when always-on is checked" into oc-dr1-dev
Doris Ling [Wed, 12 Jul 2017 03:22:57 +0000 (03:22 +0000)]
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev am:
91ca9f60e9
am:
a674aa69c2 -s ours
Change-Id: I8c03e500a6d50eb9f7085d217a6ec0d92bbba873
Doris Ling [Wed, 12 Jul 2017 03:13:51 +0000 (03:13 +0000)]
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
am:
91ca9f60e9
Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
TreeHugger Robot [Wed, 12 Jul 2017 02:58:28 +0000 (02:58 +0000)]
Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
Ajay Nadathur [Wed, 12 Jul 2017 02:09:29 +0000 (02:09 +0000)]
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev am:
482b7feaa7
am:
43a49fca4d
Change-Id: I952294bb784d35534b5c1d757141aad3260e650b
Ajay Nadathur [Wed, 12 Jul 2017 02:05:58 +0000 (02:05 +0000)]
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
am:
482b7feaa7
Change-Id: I662ed360a3fa3031679ad91cb3280893694b60bd
TreeHugger Robot [Wed, 12 Jul 2017 01:57:26 +0000 (01:57 +0000)]
Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
Ajay Nadathur [Tue, 11 Jul 2017 18:45:08 +0000 (11:45 -0700)]
Remove next button from FingerprintEnroll screen
bug:
63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040
Ajay Nadathur [Sat, 8 Jul 2017 01:04:14 +0000 (18:04 -0700)]
Do not show options if screen lock types is empty
Bug:
63311251
Test: Manually tested on device
Change-Id: Ia56a0791b89635efb4f8305f39b586b8054271cf
TreeHugger Robot [Wed, 12 Jul 2017 00:25:13 +0000 (00:25 +0000)]
Merge "Update spacing and background color for condition/suggestion."
jackqdyulei [Wed, 12 Jul 2017 00:20:57 +0000 (00:20 +0000)]
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev am:
c2e0e41446
am:
7811db450e -s ours
Change-Id: I130d6fffef171859865780819184e9c5a33d0377
jackqdyulei [Wed, 12 Jul 2017 00:12:26 +0000 (00:12 +0000)]
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
am:
c2e0e41446
Change-Id: Ibc5adabb7cfb83815423a30bd4bd94c4b6d7d8fa
Daniel Nishi [Tue, 11 Jul 2017 20:38:38 +0000 (13:38 -0700)]
Fix filter bug for non-internal app filtering.
By default, the filter would show all non-categorized apps. This,
however, regressed the external storage apps view which does not have
categorization (yet). By adding back in a legacy option to use the old
purely UUID filtering, we can fix the regression.
Change-Id: I72d8d3bc08fbdff53374eb1e973bce9f8d7e2e79
Fixes:
63542896
Test: Settings unit test
TreeHugger Robot [Wed, 12 Jul 2017 00:01:47 +0000 (00:01 +0000)]
Merge "Remove obsolete bluetooth pages" into oc-dr1-dev
Ajay Nadathur [Tue, 11 Jul 2017 18:12:47 +0000 (11:12 -0700)]
Add another fingerprint button not visible in landscape mode
bug:
63067568
Test: Manually tested and verified
Change-Id: I172bbf4c4db6cebb2cc96874f3d8d29e859b07d1
Maurice Lam [Tue, 11 Jul 2017 23:50:49 +0000 (23:50 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev am:
13a1a98bb9
am:
4c64565518
Change-Id: I7cbae211658358117840b25165cdac7aa2f375fd
Maurice Lam [Tue, 11 Jul 2017 23:47:21 +0000 (23:47 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
am:
13a1a98bb9
Change-Id: I2bdb8180ab33f8410112c411e0182ce46e462c4f
Maurice Lam [Tue, 11 Jul 2017 23:41:32 +0000 (23:41 +0000)]
Merge "Add category for wallpaper suggestion" into oc-dr1-dev
Soroosh Mariooryad [Tue, 11 Jul 2017 23:01:12 +0000 (23:01 +0000)]
Merge "Adding warmup call API for Settings search ranking."
Doris Ling [Thu, 6 Jul 2017 22:21:31 +0000 (15:21 -0700)]
Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
#F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp
Fix:
63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
Kevin Chyn [Tue, 11 Jul 2017 22:40:16 +0000 (22:40 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev am:
7bde506ed1
am:
bab6e592bc
Change-Id: I2e4fd1b07be1de6565dd2842211392d8f6cb3e36
Kevin Chyn [Tue, 11 Jul 2017 22:36:47 +0000 (22:36 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
am:
7bde506ed1
Change-Id: I638df735c2716cc243a471687d176be6613e8bce
TreeHugger Robot [Tue, 11 Jul 2017 22:32:19 +0000 (22:32 +0000)]
Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
Doris Ling [Tue, 11 Jul 2017 18:09:18 +0000 (11:09 -0700)]
Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
#F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp
Bug:
63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
jackqdyulei [Tue, 11 Jul 2017 22:11:45 +0000 (22:11 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev am:
4e4c73bfc7
am:
4eba1d469c -s ours
Change-Id: I7aeda3d969c64565fc0d6d1ce14e5353d441879b
jackqdyulei [Tue, 11 Jul 2017 22:08:19 +0000 (22:08 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev
am:
4e4c73bfc7
Change-Id: Id317c4003fd560c5cff4da7191198aa17ea97f7b
Lei Yu [Tue, 11 Jul 2017 22:05:25 +0000 (22:05 +0000)]
Merge "Remove obsolete bluetooth pages"
TreeHugger Robot [Tue, 11 Jul 2017 22:05:22 +0000 (22:05 +0000)]
Merge "Automatically play the gesture video when the setting is launched."
TreeHugger Robot [Tue, 11 Jul 2017 22:02:35 +0000 (22:02 +0000)]
Merge "Bind service in onCreate" into oc-dr1-dev
jackqdyulei [Mon, 10 Jul 2017 22:15:33 +0000 (15:15 -0700)]
Remove obsolete bluetooth pages
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests
Future cl will remove the page switch API in BluetoothFeatureProvider
Bug:
63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Merged-In: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Fan Zhang [Mon, 10 Jul 2017 22:59:21 +0000 (15:59 -0700)]
Use pref controller to get non-indexable in network setting
Change-Id: I2bcc9047146f4ad014d5929e66ee895ee497b641
Fix:
62555826
Test: robotests
Jack He [Tue, 11 Jul 2017 21:26:09 +0000 (21:26 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev am:
86fd147ac6
am:
99eab3d5f9
Change-Id: I7c78e818010bb513dd2ac1d65baa00f4159073b1
Jack He [Tue, 11 Jul 2017 21:22:40 +0000 (21:22 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
am:
86fd147ac6
Change-Id: Ib56a1d03e9e74632137117802a5baab3870947bb
TreeHugger Robot [Tue, 11 Jul 2017 21:16:32 +0000 (21:16 +0000)]
Merge "Bluetooth: mLocalAdapter should never be null" into oc-dr1-dev
Stephen Chen [Tue, 11 Jul 2017 20:30:38 +0000 (20:30 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev am:
89fdea9807
am:
e549e732bd -s ours
Change-Id: Ia63966016655faa3e113003ac04ddd4bf3386bf8
Stephen Chen [Tue, 11 Jul 2017 20:27:39 +0000 (20:27 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am:
89fdea9807
Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
TreeHugger Robot [Tue, 11 Jul 2017 20:21:01 +0000 (20:21 +0000)]
Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
jackqdyulei [Mon, 10 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Bind service in onCreate
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug:
62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Merged-In: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Kevin Chyn [Fri, 7 Jul 2017 18:22:16 +0000 (11:22 -0700)]
Assist gesture title should not be translated, remove unused strings
Bug:
63441962
Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
TreeHugger Robot [Tue, 11 Jul 2017 20:15:08 +0000 (20:15 +0000)]
Merge "Bind service in onCreate"
jackqdyulei [Mon, 10 Jul 2017 22:15:33 +0000 (15:15 -0700)]
Remove obsolete bluetooth pages
1. Remove BluetoothSettingsObsolete
2. Remove DeviceListPreferenceObsoleteFragment
3. Update master swtich, now constantly point to new page
4. Update the tests
Future cl will remove the page switch API in BluetoothFeatureProvider
Bug:
63444548
Test: Test still pass
Change-Id: I24fb5cd03cf30044edb7201426e11e0a818f0a7f
Daniel Nishi [Tue, 11 Jul 2017 20:00:20 +0000 (20:00 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev am:
64acb2906c
am:
4961451a4e
Change-Id: I992843e238acc4720c1fd5ade1cb4a66936ecb9c
Daniel Nishi [Tue, 11 Jul 2017 19:56:41 +0000 (19:56 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev
am:
64acb2906c
Change-Id: I980227fd99274364a7160a0e896b9518c2de1dd0
Daniel Nishi [Tue, 11 Jul 2017 19:46:19 +0000 (19:46 +0000)]
Merge "Expand ASM activation warning." into oc-dr1-dev
Fan Zhang [Tue, 11 Jul 2017 19:20:59 +0000 (19:20 +0000)]
Merge "Use preference theme from SettingsLib"
Jack He [Tue, 11 Jul 2017 19:04:01 +0000 (12:04 -0700)]
Bluetooth: mLocalAdapter should never be null
* mLocalAdapter should never be null
* We should crash if it is ever null
Bug:
63442969
Test: make, pair Bluetooth device
Change-Id: If98f9ea0762927eb57d00224b62abf24bbec69ba
Rajeev Kumar [Tue, 11 Jul 2017 19:02:17 +0000 (19:02 +0000)]
Merge "Add custom attributes to DonutView."
Maurice Lam [Tue, 11 Jul 2017 18:31:30 +0000 (18:31 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev am:
540d92a7e9
am:
ace9759446
Change-Id: Ib134acb1856b83eacd1c1d57e7e7215961d5ec6d
Maurice Lam [Tue, 11 Jul 2017 18:27:30 +0000 (18:27 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
am:
540d92a7e9
Change-Id: I63b9b138b1918d066a85d19c5f91221acdd3e083
Maurice Lam [Tue, 11 Jul 2017 18:21:43 +0000 (18:21 +0000)]
Merge "Hide screen lock options button in confirm lock" into oc-dr1-dev
Geoffrey Pitsch [Mon, 10 Jul 2017 14:30:05 +0000 (10:30 -0400)]
Disable lift-to-wake when always-on is checked
The setting has little to no meaning when AOD is on.
Test: make
ROBOTEST_FILTER=AmbientDisplayAlwaysOnPreferenceControllerTest
RunSettingsRoboTests -j
Bug:
62391405
Change-Id:If5492227755ca81ec0bcf921a81e2bfd33a85b9c
jackqdyulei [Mon, 10 Jul 2017 20:22:50 +0000 (13:22 -0700)]
Bind service in onCreate
This cl puts the binding to onCreate instead of constructor, so
preference controller won't bind/unbind service without registering
Lifecycle.
Bug:
62105045
Test: RunSettingsRoboTests
Change-Id: I1e60d4b6ad7270aa5d04b7ec9fae1d3200fccc5f
Doris Ling [Tue, 11 Jul 2017 17:38:24 +0000 (10:38 -0700)]
Automatically play the gesture video when the setting is launched.
- and save the video pause state on config change so that the paused
video will not auto start again on screen rotation.
Change-Id: I3f41849ee3063942fb4141e4556e494bc8439226
Fix:
63145847
Test: make RunSettingsRoboTests
Rajeev Kumar [Mon, 10 Jul 2017 18:26:39 +0000 (11:26 -0700)]
Add custom attributes to DonutView.
Note: These changes are required for Data balance UI.
Bug:
62349208
Test: Manual
Change-Id: I50f304580f681dc1461fb82d84ce0fede21b4b87
TreeHugger Robot [Tue, 11 Jul 2017 17:24:43 +0000 (17:24 +0000)]
Merge "Use a grey shade under progress spinner in wifi settings"
Daniel Nishi [Tue, 27 Jun 2017 22:09:20 +0000 (15:09 -0700)]
Expand ASM activation warning.
If the device had ASM enabled by default but still opted to disable ASM
for policy reasons, we need to start warning the user.
Change-Id: I6a296e95d00413308de3ddc565b42c5f605087e9
Fixes:
62105682
Test: Settings robotest
TreeHugger Robot [Tue, 11 Jul 2017 12:04:38 +0000 (12:04 +0000)]
Merge "Add special lock screen prompt strings for strong auth."
Charles He [Tue, 4 Jul 2017 10:50:03 +0000 (11:50 +0100)]
Add special lock screen prompt strings for strong auth.
Due to incorrect strings, we temporarily disabled the prompt strings for
strong auth and instead used the generic ones as a short-term fix. In
this CL, we correct the strong auth prompt strings and add them back to
the lock screen UI. The new strings are in line with those in keyguard.
Bug:
36511626
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ifba689db37cc7d331eb1a774814f6b6235977ff9
Bill Yi [Tue, 11 Jul 2017 04:19:00 +0000 (04:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
75bcd075f2 -s ours
am:
219086822c -s ours
Change-Id: Icc709fda2de3c0a740cb0e492f7e7fd78b32cbe0
Bill Yi [Tue, 11 Jul 2017 04:18:29 +0000 (04:18 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours am:
a8d19dc2e4 -s ours
am:
4a11531ec7 -s ours
Change-Id: I9cdbcf32e517361752d0b5868671f8cc0df2fc15
Bill Yi [Tue, 11 Jul 2017 04:18:09 +0000 (04:18 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours am:
2865272522 -s ours
am:
81a9389ebd -s ours
Change-Id: Id15b3a7b0175943e4c0a83af64643d7bc611c09c
Bill Yi [Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
75bcd075f2 -s ours
Change-Id: Ic3bdba9d8575e66c4e94229380e3225881244013
Bill Yi [Tue, 11 Jul 2017 04:08:17 +0000 (04:08 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours
am:
a8d19dc2e4 -s ours
Change-Id: I86658e992835680c75c69cd869acb314d5b93c3e
Bill Yi [Tue, 11 Jul 2017 04:03:04 +0000 (04:03 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours am:
750540ae48 -s ours
am:
2865272522 -s ours
Change-Id: I0b8b30eda46b1997915adf4ee3921657bdb477a5
TreeHugger Robot [Tue, 11 Jul 2017 04:01:24 +0000 (04:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Tue, 11 Jul 2017 03:55:40 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours
am:
750540ae48 -s ours
Change-Id: Ie4b8baffb9d82f30bef5251893124152a66f8f1c
Bill Yi [Tue, 11 Jul 2017 03:55:18 +0000 (03:55 +0000)]
Import translations. DO NOT MERGE am:
7267438b58 -s ours
am:
750540ae48 -s ours
Change-Id: If2ede8c90fef89686c2ea93765e7d7acab7e9c26
Bill Yi [Tue, 11 Jul 2017 03:47:35 +0000 (03:47 +0000)]
Import translations. DO NOT MERGE
am:
7267438b58 -s ours
Change-Id: Id5933547a1b04477e00dbef1fd88382a01e02891
Kevin Chyn [Tue, 11 Jul 2017 03:37:34 +0000 (03:37 +0000)]
Merge "Remove unnecessary keywords" into oc-dr1-dev am:
9cf03c3884
am:
b5b7ef69bf
Change-Id: I8abf3025eb9b08283b19af3caba6100c46957ae0
Bill Yi [Tue, 11 Jul 2017 03:35:23 +0000 (03:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
f812f94216 -s ours am:
c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
am:
51e0ed982c -s ours
Change-Id: Ib0364671f7637f59a29c29abd90b7ddbf8b39f63
Kevin Chyn [Tue, 11 Jul 2017 03:35:06 +0000 (03:35 +0000)]
Merge "Remove unnecessary keywords" into oc-dr1-dev
am:
9cf03c3884
Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
Bill Yi [Tue, 11 Jul 2017 03:35:05 +0000 (03:35 +0000)]
Import translations. DO NOT MERGE am:
f812f94216 -s ours am:
bc4faa93e2 -s ours
am:
bf24c5db83 -s ours
Change-Id: If9f14b394f7fc6148ac621daa513319bfdfbaeba
Android Build Merger (Role) [Tue, 11 Jul 2017 03:32:54 +0000 (03:32 +0000)]
Merge "Import translations. DO NOT MERGE am:
f812f94216 -s ours am:
c45dd3f1ec -s ours" into oc-dr1-dev-plus-aosp
Bill Yi [Tue, 11 Jul 2017 03:32:38 +0000 (03:32 +0000)]
Import translations. DO NOT MERGE am:
f812f94216 -s ours
am:
c45dd3f1ec -s ours
Change-Id: Ic5a239ac412ccb46da32f08843c039cc4313a67b
OSDN Git Service
