OSDN Git Service
Matthew Fritze [Wed, 9 Aug 2017 18:37:19 +0000 (18:37 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
am:
e0c0616d6f
Change-Id: I4c63b3c4fad2824d45cc6637d08074a7fb3059fd
TreeHugger Robot [Wed, 9 Aug 2017 18:22:21 +0000 (18:22 +0000)]
Merge "Fix DataSaverBackend objects created on background threads" into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 18:04:15 +0000 (18:04 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
am:
293899d5ce
Change-Id: Ic1518ede3d6ae01f409c44582415233371ba48ab
Fan Zhang [Wed, 9 Aug 2017 18:03:29 +0000 (18:03 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
am:
54d816fd90
Change-Id: I7a015ea3ddd7b7cdd9db6896e6459ce3f491dabc
TreeHugger Robot [Wed, 9 Aug 2017 17:53:22 +0000 (17:53 +0000)]
Merge "Refresh preferences when background data switch is toggled" into oc-mr1-dev
TreeHugger Robot [Wed, 9 Aug 2017 17:52:49 +0000 (17:52 +0000)]
Merge "Misc fixes for settings" into oc-mr1-dev
The Android Open Source Project [Wed, 9 Aug 2017 17:14:44 +0000 (17:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
882d35715e -s ours
Change-Id: I2eccdf0b32f8a206717eedbe14a39102e9cb2070
TreeHugger Robot [Wed, 9 Aug 2017 16:46:44 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Oren Blasberg [Wed, 9 Aug 2017 16:06:02 +0000 (16:06 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
am:
a3a0a1e2e8
Change-Id: I9de7aeaa4e81b969c40e137125777f8eb7274152
TreeHugger Robot [Wed, 9 Aug 2017 15:54:19 +0000 (15:54 +0000)]
Merge "Update SMS mirroring icon to new style." into oc-mr1-dev
Adrian Roos [Wed, 9 Aug 2017 13:55:00 +0000 (13:55 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
am:
a147d4a616
Change-Id: I6a585ed52bf746fe125cd8abcdd6ca5ac1ef8d87
Julia Reynolds [Wed, 9 Aug 2017 13:54:40 +0000 (13:54 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
am:
e286c0627b
Change-Id: If04c234b436914a208c3a0cc9f3f9c6902d5d2d5
TreeHugger Robot [Wed, 9 Aug 2017 13:36:40 +0000 (13:36 +0000)]
Merge "FRP: Add dedicated explanation strings for ConfirmCredential" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:26:31 +0000 (13:26 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev am:
64b15c4a7b
am:
6eafaf46aa
Change-Id: I27c05398a20cfe1ece5313c31a0a502fd7ce3f42
TreeHugger Robot [Wed, 9 Aug 2017 13:25:48 +0000 (13:25 +0000)]
Merge "Use colorful +s" into oc-mr1-dev
Andrew Sapperstein [Wed, 9 Aug 2017 13:06:33 +0000 (13:06 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
am:
64b15c4a7b
Change-Id: Ic1bd3074c086723c231c05fe2706f6ccc30c4cdd
Adrian Roos [Sun, 23 Jul 2017 12:18:16 +0000 (14:18 +0200)]
FRP: Add dedicated explanation strings for ConfirmCredential
Change-Id: I1bf63898509032560cd302fde9dfe05473336e49
Fixes:
63958816
Test: adb shell settings put global device_provisioned 1 && adb shell am start -a android.app.action.CONFIRM_FRP_CREDENTIAL; verify strings
Winston Man [Wed, 9 Aug 2017 09:19:43 +0000 (09:19 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
am:
466adba25e
Change-Id: Ib6e3348917eb90515aeef8e7131e55c95ee0768e
Winston Man [Wed, 9 Aug 2017 09:09:35 +0000 (09:09 +0000)]
Merge "Move work notification settings back to bottom" into oc-mr1-dev
Matthew Fritze [Tue, 18 Jul 2017 20:12:05 +0000 (13:12 -0700)]
Fix DataSaverBackend objects created on background threads
Add the main looper to the handler created with each
DataSaverBackend to avoid crashes when the objects are
created on background threads.
Bug:
62022517
Test: make RunSettingsRoboTests
Change-Id: Ie5ffabbfbe7660761527b3ecd51e6bc5a43c1ace
The Android Open Source Project [Wed, 9 Aug 2017 01:14:31 +0000 (18:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7c03ce57550b6618594ff59a6cb82d5871207216
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Eric Schwarzenbach [Wed, 9 Aug 2017 01:04:33 +0000 (01:04 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
am:
9e47d2c233
Change-Id: I439eea568712e0818613ad8b88b2b9770ae72a68
TreeHugger Robot [Wed, 9 Aug 2017 00:46:57 +0000 (00:46 +0000)]
Merge "Add modify string to resources." into oc-mr1-dev
Fan Zhang [Wed, 9 Aug 2017 00:36:06 +0000 (17:36 -0700)]
Refresh preferences when background data switch is toggled
Change-Id: Id58f565645fc3c668b516dbd05049559afa9535e
Fixes:
64466310
Test: robotests
Maurice Lam [Wed, 9 Aug 2017 00:02:12 +0000 (00:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6 am:
d415cbfc0d
am:
6b5f99bcbd
Change-Id: Ibf17029cec44e8767bf843358f497efebc9cec7d
TreeHugger Robot [Tue, 8 Aug 2017 23:59:50 +0000 (23:59 +0000)]
Merge "Refactoring for AmbientAlwaysOnPreferenceController" into oc-dr1-dev
Maurice Lam [Tue, 8 Aug 2017 23:26:20 +0000 (23:26 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef am:
dbfde54fb6
am:
d415cbfc0d
Change-Id: Ic3a74f8ce7d4a068d4a21fe367cd232a103bf130
Maurice Lam [Tue, 8 Aug 2017 23:05:55 +0000 (23:05 +0000)]
Merge "Show help string when onEnrollmentHelp() is called" am:
5a926705ef
am:
dbfde54fb6
Change-Id: Ie98fa2d24ebe48e868762cf85129139974ce845f
Maurice Lam [Tue, 8 Aug 2017 22:56:38 +0000 (22:56 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
am:
5a926705ef
Change-Id: I5af1cac8ee4018e40005484631b6f3f3434e03b9
Fan Zhang [Tue, 8 Aug 2017 22:28:07 +0000 (22:28 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
am:
fef5f6aa4a
Change-Id: I8c5ee9684f4a1fb8356aa35ab6ca26b80ada7436
Salvador Martinez [Tue, 8 Aug 2017 22:18:30 +0000 (22:18 +0000)]
Refactor tether logic for reuse am:
135619d483
am:
4c2fc34707 -s ours
Change-Id: I0fc8272a026d188010ce8a613f02cc6c892828c7
TreeHugger Robot [Tue, 8 Aug 2017 22:13:13 +0000 (22:13 +0000)]
Merge "Clean up logic for dismissing suggestion" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 22:08:50 +0000 (22:08 +0000)]
Refactor tether logic for reuse
am:
135619d483
Change-Id: I216dcb55a0f2423766abb4c30fc996f13afda2e4
Maurice Lam [Tue, 8 Aug 2017 22:02:20 +0000 (22:02 +0000)]
Merge "Show help string when onEnrollmentHelp() is called"
Salvador Martinez [Tue, 8 Aug 2017 21:59:50 +0000 (21:59 +0000)]
Refactor tether logic for reuse am:
135619d483 -s ours
am:
cc92875825 -s ours
Change-Id: Ifdf63b4f14dffb0cdf4149f228e03dd7807d3562
Salvador Martinez [Tue, 8 Aug 2017 21:53:54 +0000 (21:53 +0000)]
Refactor tether logic for reuse
am:
135619d483 -s ours
Change-Id: I5b00c372d02e86dc683c49e1142167316613f96f
Eric Schwarzenbach [Tue, 8 Aug 2017 21:11:51 +0000 (14:11 -0700)]
Add modify string to resources.
Bug:
36483704
Test: n/a
Change-Id: I8c68e11a7bbaff98e6384713dea69ef34bf46d01
Daniel Nishi [Tue, 8 Aug 2017 21:03:32 +0000 (21:03 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
am:
a28dc40543
Change-Id: I55ba747a08ac5ab6c043a7b53961b1728e4c1a6d
Andrew Sapperstein [Tue, 8 Aug 2017 02:06:57 +0000 (19:06 -0700)]
Refactoring for AmbientAlwaysOnPreferenceController
Makes a few methods static so we can call them from other locations.
Bug:
64256644
Test: robotests
Change-Id: Ie97cda342c3143a21bd273e4d29f64f75e006059
Oren Blasberg [Tue, 8 Aug 2017 18:21:19 +0000 (11:21 -0700)]
Update SMS mirroring icon to new style.
Test: Verified the icon looks good in Settings.
Bug:
37546615
Change-Id: I313548022fa37676bc0dfee598d45e9f09d5bfb5
Daniel Nishi [Tue, 8 Aug 2017 20:46:50 +0000 (20:46 +0000)]
Merge "Add floats to the SecureSettings shadow." into oc-mr1-dev
Oren Blasberg [Tue, 8 Aug 2017 20:07:55 +0000 (20:07 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
am:
101f3d2e44
Change-Id: If2e2c15f2672bac1250783376c102b9bda6e1156
TreeHugger Robot [Tue, 8 Aug 2017 20:02:42 +0000 (20:02 +0000)]
Merge "SMS mirroring: Add placeholder summary." into oc-mr1-dev
Alison Cichowlas [Tue, 8 Aug 2017 19:50:50 +0000 (19:50 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
am:
4068fe7d38
Change-Id: I23f34a35cea64a8f599f3dca2c9a65b8b85d05b1
TreeHugger Robot [Tue, 8 Aug 2017 19:36:40 +0000 (19:36 +0000)]
Merge "Add new strings for b/
63109928" into oc-mr1-dev
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug:
64092292
Change-Id: If8191698023d1da90db99b518d9f770683b5c789
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
jackqdyulei [Tue, 8 Aug 2017 19:28:39 +0000 (19:28 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
am:
189899c169
Change-Id: If77a54cbcb8dc972297fab9779b3947aa25cf020
TreeHugger Robot [Tue, 8 Aug 2017 19:22:50 +0000 (19:22 +0000)]
Merge "Add uid data even though on battery stats" into oc-mr1-dev
Salvador Martinez [Tue, 8 Aug 2017 19:02:08 +0000 (19:02 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
am:
705a9e7e85
Change-Id: If61a7e53543929257b689c9cc7326c836d6c397c
TreeHugger Robot [Tue, 8 Aug 2017 18:53:39 +0000 (18:53 +0000)]
Merge "Refactor tether logic for reuse" into oc-mr1-dev
Daniel Nishi [Thu, 27 Jul 2017 18:06:41 +0000 (11:06 -0700)]
Add floats to the SecureSettings shadow.
Test: Exercised in other robotests
Change-Id: I0791bdddf0bc97abc21cd27613998247b11d7bb4
Julia Reynolds [Tue, 8 Aug 2017 18:00:09 +0000 (14:00 -0400)]
Use colorful +s
Instead of grey
Change-Id: Iac0454110d3af9045a83098e67957130987ad718
Fixes:
63820885
Test: manual
Fan Zhang [Tue, 8 Aug 2017 00:29:18 +0000 (17:29 -0700)]
Misc fixes for settings
- Set device credential's Window flag to be SECURE. This prevents
showing any pattern/pin in recent list.
- Disable tap sound on entity header
Fixes:
64339515
Fixes:
64413598
Test: visual
Test: runtest --path \
tests/app/src/com/android/settings/password/ChooseLockGenericTest.java
Winston Man [Tue, 8 Aug 2017 13:32:52 +0000 (14:32 +0100)]
Move work notification settings back to bottom
- Settings order now matches
- screenshot with work profile: https://hsv.googleplex.com/
5742195667632128
- screenshot without work profile: https://hsv.googleplex.com/
5683485175971840
Bug:
64436619
Test: RunSettingsRoboTests; manual
Merged-In: Ia665ee5295981e11193e69585232874d1dddba23
Change-Id: Ia665ee5295981e11193e69585232874d1dddba23
Alison Cichowlas [Tue, 8 Aug 2017 15:05:23 +0000 (11:05 -0400)]
Add new strings for b/
63109928
Test: Strings only; manual
Bug:
63109928
Change-Id: Ib2d491aff81faa866300e6b4f3a0d7c0e1417b98
Android Build Merger (Role) [Tue, 8 Aug 2017 03:07:45 +0000 (03:07 +0000)]
Merge "Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8 am:
b1c0e38284" into oc-mr1-dev-plus-aosp
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b32159f242
Change-Id: I7734f18a3fd1c5abc401131862701c47bfae64c9
Salvador Martinez [Tue, 8 Aug 2017 03:07:08 +0000 (03:07 +0000)]
Refactor permissions code for bluetooth controller enabler am:
a8db5ccea8
am:
b1c0e38284
Change-Id: I1f58b6310db52eb0d3286a755e210dfe74c6fc96
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: Iba30360a0ec1c074a62562d4a9937eb9e37a4881
Salvador Martinez [Tue, 8 Aug 2017 03:04:45 +0000 (03:04 +0000)]
Refactor permissions code for bluetooth controller enabler
am:
a8db5ccea8
Change-Id: I6288cf595419229f58abb396cbe9b6cf6e2c5fc4
Salvador Martinez [Thu, 3 Aug 2017 20:56:10 +0000 (13:56 -0700)]
Refactor permissions code for bluetooth controller enabler
Bluetooth may be disabled for a user. This CL refactors the code
that determines this a bit so we can query that without having to
have the UI open.
Test: robotests still pass
Bug:
62022517
Change-Id: Ic0837d21bdc4007a20d6ad138753d4f5d37ceceb
Merged-In: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
Salvador Martinez [Mon, 7 Aug 2017 17:22:37 +0000 (10:22 -0700)]
Refactor tether logic for reuse
Some logic related to permissions needs to be used elsewhere. This
CL refactors the relevant code into a method so that it stays in
sync in both places.
Test: robotests still pass
Bug:
64092292
Change-Id: I3b54529865e16b7e1640b0adda7f7edb9d1a41f7
Philip P. Moltmann [Mon, 7 Aug 2017 23:06:28 +0000 (23:06 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
am:
62b6b4d292
Change-Id: I56d7811dd62fdfbedf5d958496448479c352dd0e
TreeHugger Robot [Mon, 7 Aug 2017 22:58:33 +0000 (22:58 +0000)]
Merge "Revoke invidivual permissions" into oc-mr1-dev
jackqdyulei [Wed, 26 Jul 2017 20:14:46 +0000 (13:14 -0700)]
Add uid data even though on battery stats
Advacned battery page doesn't show background toggle because it
doesn't get uid from battery stats. This cl make it get uid by
package name even though without battery stats.
Bug:
64049162
Test: RunSettingsRoboTests
Change-Id: Ie0f67ce9d080c02763a8382740e0640a66ce6053
Peter Qiu [Mon, 7 Aug 2017 20:26:23 +0000 (20:26 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
am:
8d3bfd62e1
Change-Id: If53c79b20d637623a6d70b1c3bfd7efa788f25f3
TreeHugger Robot [Mon, 7 Aug 2017 20:08:31 +0000 (20:08 +0000)]
Merge "wifi: WifiConfigController: fix possible NPE in showSecurityFields" into oc-mr1-dev
Philip P. Moltmann [Wed, 2 Aug 2017 23:40:40 +0000 (16:40 -0700)]
Revoke invidivual permissions
The permission->group mapping is not guaranteed to be stable.
Bug:
64301150
Test: Manually
Change-Id: I44ec5964c01d22d615a9a4717eecabd406392752
Beverly [Mon, 7 Aug 2017 17:21:53 +0000 (17:21 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
am:
7fc4dd7e7b
Change-Id: Ie989acfd2f7896a1160cac32f5e379112737028a
TreeHugger Robot [Mon, 7 Aug 2017 17:16:06 +0000 (17:16 +0000)]
Merge "Uninstall app through notif closes app settings." into oc-mr1-dev
Peter Qiu [Mon, 7 Aug 2017 17:08:49 +0000 (10:08 -0700)]
wifi: WifiConfigController: fix possible NPE in showSecurityFields
Bug:
64438040
Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=WifiConfigControllerTest
Change-Id: I2ddc5c07a3c95cba91cef532dc2c84529146d100
Android Build Merger (Role) [Mon, 7 Aug 2017 17:06:17 +0000 (17:06 +0000)]
Merge "Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours am:
f1398725a8 -s ours" into oc-mr1-dev-plus-aosp
Matthew Fritze [Mon, 7 Aug 2017 17:05:37 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395 -s ours
am:
f1398725a8 -s ours
Change-Id: I6d3710f9e399901aa62d69ae9061a5f563d6dd61
Matthew Fritze [Mon, 7 Aug 2017 17:05:20 +0000 (17:05 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev am:
4f0e5f8395
am:
d1b29a4350 -s ours
Change-Id: Idcc62948fc80573fc49fef10f457841bc5bbd0de
Matthew Fritze [Mon, 7 Aug 2017 17:03:14 +0000 (17:03 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395 -s ours
Change-Id: I888297c779795ad7489be0e7238d2bc5d673610e
Matthew Fritze [Mon, 7 Aug 2017 17:02:19 +0000 (17:02 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
am:
4f0e5f8395
Change-Id: Ic0ec9ab01037fa67238b541f0e9e6bd1bde630fb
TreeHugger Robot [Mon, 7 Aug 2017 16:53:29 +0000 (16:53 +0000)]
Merge "Expose Location toggling logic" into oc-dr1-dev
Matthew Fritze [Mon, 7 Aug 2017 15:15:41 +0000 (15:15 +0000)]
Expose Location toggling logic
am:
6593453d59
Change-Id: Ic29118bac8ba7462e2f1dc889b4c6878e7a0e8ae
Beverly [Fri, 4 Aug 2017 17:41:23 +0000 (13:41 -0400)]
Uninstall app through notif closes app settings.
Change-Id: I7887c7887b654c78a0fea16e898679e434fbeb53
Fixes:
62051546
Test: manual
Bill Yi [Mon, 7 Aug 2017 06:22:10 +0000 (06:22 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours am:
335a436998 -s ours
am:
cf297dcca3 -s ours
Change-Id: Id81f76f748bace0d87d03e2f5ff31dcc9f32750d
Bill Yi [Mon, 7 Aug 2017 06:02:28 +0000 (06:02 +0000)]
Import translations. DO NOT MERGE am:
c89d5b0093 -s ours
am:
335a436998 -s ours
Change-Id: I29958981b713fcee867dc6457cab116518bbe0e9
Bill Yi [Mon, 7 Aug 2017 05:50:24 +0000 (05:50 +0000)]
Import translations. DO NOT MERGE
am:
c89d5b0093 -s ours
Change-Id: Ia21b29a071f07f37bb1d3d5b348a70dd2ec7f00a
Matthew Fritze [Tue, 1 Aug 2017 00:16:27 +0000 (17:16 -0700)]
Expose Location toggling logic
Specifically refactor the check for secondary user and the
method to toggle location mode using the previously set
location mode.
Test: robotests
Bug:
62022517
Change-Id: I519fad6d802efd8af2e77c623f698e19d4cdc800
Matthew Fritze [Sun, 6 Aug 2017 20:52:37 +0000 (20:52 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
am:
688e5438dd
Change-Id: Ib60cae1c0cf7e0c55b90792d16df3803e84a7835
TreeHugger Robot [Sun, 6 Aug 2017 20:46:27 +0000 (20:46 +0000)]
Merge "Add INTENT_ONLY as a ResultPayload Availibility" into oc-mr1-dev
Bill Yi [Sun, 6 Aug 2017 17:38:44 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iba61a113e9577a1afa3e18880e803c65352e1a73
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Sun, 6 Aug 2017 04:55:27 +0000 (04:55 +0000)]
Import translations. DO NOT MERGE
am:
57c8508960 -s ours
Change-Id: I813ef1adb4ab7dac7fa61572aa9835f6fbc8187d
Bill Yi [Sun, 6 Aug 2017 02:27:58 +0000 (19:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2383afbd653fa9e3a1ed0e469bdbd891868f992e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Android Build Merger (Role) [Sat, 5 Aug 2017 05:40:07 +0000 (05:40 +0000)]
Merge "Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff am:
1f39ca8abf -s ours" into oc-mr1-dev-plus-aosp
Doris Ling [Sat, 5 Aug 2017 05:39:42 +0000 (05:39 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff -s ours
am:
e46ed6b7c5 -s ours
Change-Id: Ica7b012178b2cc1d2a7115685b5054bc1e8b5d21
Doris Ling [Sat, 5 Aug 2017 05:39:41 +0000 (05:39 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev am:
8f54cd46ff
am:
1f39ca8abf -s ours
Change-Id: I73d69b3477582bfc5ea77a996b41e5b7c7a8d9cd
Doris Ling [Sat, 5 Aug 2017 05:32:43 +0000 (05:32 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am:
8f54cd46ff
Change-Id: Ib2b362ce72312738201fa2003c2c5a8795c2366d
Doris Ling [Sat, 5 Aug 2017 05:32:42 +0000 (05:32 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
am:
8f54cd46ff -s ours
Change-Id: I42d026677b6ca61de451a590b938605e79c1832c
TreeHugger Robot [Sat, 5 Aug 2017 05:20:42 +0000 (05:20 +0000)]
Merge "Fix crash when dismissing suggestions." into oc-dr1-dev
Android Build Merger (Role) [Sat, 5 Aug 2017 03:03:54 +0000 (03:03 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
26e4fda3f2 -s ours am:
a064cc02fc -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Sat, 5 Aug 2017 03:03:35 +0000 (03:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
26e4fda3f2 -s ours
am:
a064cc02fc -s ours
Change-Id: Ieb0315b765927b4c668862108fea2cea6f0aed69
Bill Yi [Sat, 5 Aug 2017 03:03:20 +0000 (03:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
26e4fda3f2 -s ours
am:
cf898e3ff4 -s ours
Change-Id: If805e7deb61b8fce522bb591771ad3322bcf52a2
Bill Yi [Sat, 5 Aug 2017 02:49:27 +0000 (02:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
26e4fda3f2 -s ours
Change-Id: I8bc54083c553844ec2c8a65858f4b305fa30cf82
Bill Yi [Sat, 5 Aug 2017 02:49:07 +0000 (02:49 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
26e4fda3f2 -s ours
Change-Id: I3a6622203e20263858b4d0e1d7fcd9233ad2c886
TreeHugger Robot [Sat, 5 Aug 2017 02:37:34 +0000 (02:37 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev