OSDN Git Service
Petri Gynther [Sat, 19 May 2018 05:59:50 +0000 (22:59 -0700)]
Add new metrics constant for Bluetooth A2DP hardware offload
Bug:
63932139
Bug:
79568680
Test: Settings app compiles without errors
Change-Id: I535f9cd819787f6c8d24facb5824dbf7472d5231
Merged-In: I535f9cd819787f6c8d24facb5824dbf7472d5231
TreeHugger Robot [Sun, 20 May 2018 04:53:24 +0000 (04:53 +0000)]
Merge "IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint" into pi-dev
Winson Chung [Sat, 19 May 2018 04:36:16 +0000 (04:36 +0000)]
Merge "Fade back button in and out tied with the overview/shelf (1/2)" into pi-dev
Svet Ganov [Sat, 19 May 2018 02:59:25 +0000 (19:59 -0700)]
IMPORTANCE_FOREGROUND_SERVICE process can access fingerprint
We added a new priority IMPORTANCE_FOREGROUND_SERVICE
for foreground services and the services to which the
system is bound fall into this bucket while before they
were falling into IMPORTANCE_FOREGROUND.
Test: manual
bug:
79775649
Change-Id: I1626e78c5b7365985c5b4152637ab99aa0dea5f2
TreeHugger Robot [Sat, 19 May 2018 01:20:52 +0000 (01:20 +0000)]
Merge "Update auto-rotate and print icons" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 23:59:37 +0000 (23:59 +0000)]
Merge "clone the visibility objects for the handler thread" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 23:54:41 +0000 (23:54 +0000)]
Merge "Reset wallpaper state during startup" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 23:46:39 +0000 (23:46 +0000)]
Merge "Set enabledSurroundFormats as empty string when it is null." into pi-dev
TreeHugger Robot [Fri, 18 May 2018 23:08:19 +0000 (23:08 +0000)]
Merge changes Id4feeefa,Ie0a501b8 into pi-dev
* changes:
Add counter for predictive info for hush gesture
Update DND strings
Frank Salim [Fri, 18 May 2018 22:49:00 +0000 (22:49 +0000)]
Merge "Make ImportWrappedKey work with real hardware: Get unwrapping params from WrappedKeyEntry" into pi-dev
Antony Sargent [Fri, 18 May 2018 22:47:26 +0000 (15:47 -0700)]
Update auto-rotate and print icons
Bug:
77982107
Test: manual
Change-Id: I7c5183c7e12819204ce5ecda1017b968ef4a9957
Dake Gu [Fri, 18 May 2018 22:44:25 +0000 (22:44 +0000)]
Merge "Autofill: fix missing focus/ripple effect for authentication view" into pi-dev
Lucas Dupin [Fri, 18 May 2018 22:35:36 +0000 (15:35 -0700)]
Reset wallpaper state during startup
Test: adb shell am crash com.android.systemui
Change-Id: Ia8a75bfe9384f088efc23f12336404ece05eb885
Fixes:
79343585
TreeHugger Robot [Fri, 18 May 2018 22:13:22 +0000 (22:13 +0000)]
Merge "Fixed an issue where a notification could become empty" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 22:12:30 +0000 (22:12 +0000)]
Merge "Display Cutout: Fix ActionBarOverlayLayout to properly dispatch cutout" into pi-dev
Chavi Weingarten [Fri, 18 May 2018 21:48:54 +0000 (21:48 +0000)]
Merge changes I281c748a,Ia5b68d59 into pi-dev
* changes:
Remove preserve surface block when detaching children.
Reparent children when hiding preserved surface.
Beverly [Fri, 18 May 2018 21:33:40 +0000 (17:33 -0400)]
Add counter for predictive info for hush gesture
Test: adb shell settings get secure hush_gesture_used
Test: adb shell settings get secure manual_ringer_toggle_count
Change-Id: Id4feeefa03a5951c03b09ab466a6c399d8aadd0e
Fixes:
79537757
Beverly [Fri, 18 May 2018 21:09:45 +0000 (17:09 -0400)]
Update DND strings
Test: manual
Bug:
79525632
Change-Id: Ie0a501b8bec964b760c7f686d93ee83ec3454897
Dake Gu [Fri, 18 May 2018 16:34:46 +0000 (09:34 -0700)]
Autofill: fix missing focus/ripple effect for authentication view
When there is authentication view, autofill does not use ListView, so
it's missing the focus/ripple effect. This CL let the parent of
authentication view use the same ripple drawable as ListView.
Test: manual test on phone and TV
atest CtsAutoFillServiceTestCases
Bug: b/
79980365
Change-Id: Ief15304a3e533dbd6f45b7925db0b0c39977fd04
Adrian Roos [Wed, 22 Nov 2017 13:21:01 +0000 (14:21 +0100)]
Display Cutout: Fix ActionBarOverlayLayout to properly dispatch cutout
ActionBarOverlayLayout used to drop WindowInsets, extract the content insets
as a rect, and then dispatch a modified rect to the content view; this because
there was no way to retarget the WindowInsets to the content view, and the
WindowInsets were not truly immutable. That means however, that other kinds of
insets than the content insets do not get dispatched, such as the display cutout.
To fix this, we add APIs to inset WindowInsets, make them immutable. Note that
a similar change is needed for the support lib.
Bug:
79733300
Test: atest ActionBarOverlayLayoutTest
Change-Id: I6a69d8462163ca5e66fdb53f83def6bc4063f8aa
TreeHugger Robot [Fri, 18 May 2018 20:57:21 +0000 (20:57 +0000)]
Merge "(Behind flag) Wireless charging vibration feedback" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 20:51:22 +0000 (20:51 +0000)]
Merge "Avoid binder calls when unlocking" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 20:50:50 +0000 (20:50 +0000)]
Merge "Add 195dp bucket for Wear device support." into pi-dev
TreeHugger Robot [Fri, 18 May 2018 20:44:13 +0000 (20:44 +0000)]
Merge "Remap PS key to BUTTON_MODE on DS4 joystick" into pi-dev
Jean-Michel Trivi [Fri, 18 May 2018 20:34:47 +0000 (20:34 +0000)]
Merge "MediaFormat: fix javadoc for AAC-related keys" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 20:19:00 +0000 (20:19 +0000)]
Merge "Zen radio button is width 48dp" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 19:42:18 +0000 (19:42 +0000)]
Merge "Fixes the secondary splitscreen dimensions" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 19:34:13 +0000 (19:34 +0000)]
Merge "Fixed an issue where the clear all expansion wasn't smooth" into pi-dev
Selim Cinek [Fri, 18 May 2018 19:06:10 +0000 (12:06 -0700)]
Fixed an issue where a notification could become empty
Test: add min priority notification from lockscreen, observe no blank notification
Change-Id: Ib08e6d7372fe921f0f59074c35504e234ecc0215
Fixes:
72717838
Chris Wren [Thu, 17 May 2018 22:55:42 +0000 (18:55 -0400)]
clone the visibility objects for the handler thread
The main thread was recycling the objects before the hander could
pack up the binder call.
Change-Id: I4289bdcc5b940a0a8209fdd5d3df47972de0fa4b
Fixes:
72953296
Test: atest com.android.notification.functional.NotificationInteractionTests#testNotificationShadeMetrics
jiabin [Thu, 17 May 2018 17:33:09 +0000 (10:33 -0700)]
Set enabledSurroundFormats as empty string when it is null.
When ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS doesn't exist in settings
DB, enabledSurroundFormats will be null. Set it as empty string to avoid
crash.
Bug:
79923672
Test: Delete ENCODED_SURROUND_OUTPUT_ENABLED_FORMATS and select manual.
Change-Id: I8385bc05733ebd8ca0b64e756cf22fc8e3de09c8
Phil Weaver [Fri, 18 May 2018 19:29:47 +0000 (19:29 +0000)]
Merge "Magnification treats alpha=0 windows as invisible" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 19:01:00 +0000 (19:01 +0000)]
Merge "fix fingerprint condition on sdk level logic" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 18:40:48 +0000 (18:40 +0000)]
Merge "Add config overlay for mcc312-mnc530" into pi-dev
Beverly [Fri, 18 May 2018 18:28:57 +0000 (14:28 -0400)]
Zen radio button is width 48dp
Test: manual
Change-Id: Ia39be61c3217901145d2e4d7ab7970239b9c5c44
Fixes:
79698561
Matthew Ng [Mon, 14 May 2018 19:45:08 +0000 (12:45 -0700)]
Fixes the secondary splitscreen dimensions
Fixes the splitscreen bounds of other app introduced in ag/
3909876 and
bound issues related to rotation before splitscreen occurs from
landscape to seascape.
Fixes:
73250406
Test: splitscreen in seascape
Change-Id: I14f9512069b674da7d382ede8514545aabe8c5d7
Jorim Jaggi [Fri, 18 May 2018 18:26:03 +0000 (18:26 +0000)]
Merge "Schedule trimMemory after drawing the frame" into pi-dev
Frank Salim [Thu, 12 Apr 2018 10:09:44 +0000 (03:09 -0700)]
Make ImportWrappedKey work with real hardware:
Get unwrapping params from WrappedKeyEntry
Add @hide API for StrongBox-backed imported keys (as opposed to wrapped or generated)
Enable 3DES conditionally based on a system property.
Bug: b/
79986479
Bug: b/
79986680
Test: CTS
Change-Id: If6beedc203337027576ecd3555d11ed2874f9768
TreeHugger Robot [Fri, 18 May 2018 18:24:39 +0000 (18:24 +0000)]
Merge "Add logging to quickstep onboarding tips." into pi-dev
Selim Cinek [Fri, 18 May 2018 18:11:46 +0000 (11:11 -0700)]
Fixed an issue where the clear all expansion wasn't smooth
Test: add notification that is clearable, observe nice slowing down when expanding
Change-Id: I2fedb78c605fc72eaf3e8204fef1d493ced71eea
Fixes:
78861878
TreeHugger Robot [Fri, 18 May 2018 18:11:29 +0000 (18:11 +0000)]
Merge "Remove Hearing Aid toggle in Settings" into pi-dev
Lucas Dupin [Fri, 18 May 2018 01:00:16 +0000 (18:00 -0700)]
Avoid binder calls when unlocking
- User StrongAuthTracker instead of LockPatternUtils.
- Do not call NotificationViewHierarchyManager#updateRowStates twice,
because mEntryManager will do it.
- Do not apply doze state and it doesn't change.
Bug:
77823972
Test: ./external/chromium-trace/systrace.py power gfx freq am wm sched binder_driver view -a com.android.systemui -o ~/Desktop/sysui_unlock.html
Change-Id: I0a92bab79ea47db1885f5dab5c87962e465ccdfe
Dmitry Dementyev [Fri, 18 May 2018 17:56:25 +0000 (17:56 +0000)]
Merge "Check the return values after updating Recoverable KeyStore Database." into pi-dev
TreeHugger Robot [Fri, 18 May 2018 17:34:51 +0000 (17:34 +0000)]
Merge "wifi.proto: Add metrics for softap band preference unsatisfied" into pi-dev
Jorim Jaggi [Fri, 18 May 2018 17:24:43 +0000 (17:24 +0000)]
Merge "Fixes for SyncRtSurfaceTransactionApplier" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 17:09:36 +0000 (17:09 +0000)]
Merge "Add a hidden flag to indicate exif data block." into pi-dev
Phil Weaver [Fri, 18 May 2018 16:48:01 +0000 (09:48 -0700)]
Magnification treats alpha=0 windows as invisible
Bug:
79705072
Test: Start magnification when typing to change launcher
folder title. Typing now works, and magnification boundary
is correct.
Change-Id: I7d45c49f15cb7295d38be2c1ba7386e74f52d7bc
Jorim Jaggi [Mon, 30 Apr 2018 16:51:56 +0000 (18:51 +0200)]
Schedule trimMemory after drawing the frame
Fixes jank issues where trimMemory gets scheduled during an
animation. trimMemory likely hits code that is not in the
page cache anymore, leading to high execution time because of page
misses. Scheduling it after the next frame has been drawn
minimizes the risk that this page miss actually causes jank.
Test: Boot, switch between a couple of apps.
Bug:
78611607
Change-Id: Ia1fc411fbe6ca07861183ae484124406681118e5
Jorim Jaggi [Fri, 18 May 2018 16:23:08 +0000 (18:23 +0200)]
Fixes for SyncRtSurfaceTransactionApplier
Such that launcher can use it.
Test: Open/close app
Bug:
78611607
Change-Id: I8e66b983035eb8da9dd8349e2a5b57d3631df74f
Selim Cinek [Fri, 18 May 2018 16:20:40 +0000 (16:20 +0000)]
Merge "Keep notification when sending smart reply." into pi-dev
Makoto Onuki [Fri, 18 May 2018 15:13:27 +0000 (15:13 +0000)]
Merge "Suppress service start timeout for services within system server," into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 14:28:46 +0000 (14:28 +0000)]
Merge "More light grey APIs." into pi-dev
Adrian Roos [Fri, 18 May 2018 14:22:11 +0000 (14:22 +0000)]
Merge "WM: Perform layout based on the requested flags" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 14:21:48 +0000 (14:21 +0000)]
Merge "Don't always set the clock to View.GONE" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 14:06:18 +0000 (14:06 +0000)]
Merge "PIP: Fix transition to and from PiP when letterboxed" into pi-dev
TreeHugger Robot [Fri, 18 May 2018 13:30:29 +0000 (13:30 +0000)]
Merge "WM: Prevent unminimizing docked stack on AOD" into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 13:10:43 +0000 (13:10 +0000)]
Merge "More light grey APIs." into pi-dev
Nicolas Geoffray [Fri, 18 May 2018 13:10:10 +0000 (13:10 +0000)]
Merge "Add one new API to light grey." into pi-dev
SongFerngWang [Fri, 18 May 2018 12:57:12 +0000 (20:57 +0800)]
Add config overlay for mcc312-mnc530
This is the new Sprint mcc/mnc, config copied from 310-120.
Bug:
79771598
Test: manual - bug not reproduciable
Change-Id: I4202693ab56499304d40a595772652208d158fdc
Adrian Roos [Tue, 15 May 2018 18:13:13 +0000 (20:13 +0200)]
PIP: Fix transition to and from PiP when letterboxed
When an app is letterboxed, it cannot always take up the full
task bounds, and we need to constrain the PIP animations to
the constraints imposed by the layout.
Change-Id: If238ddfb4462c7e1e5c975f76666ad1d4ec3b076
Fixes:
77802617
Test: Enable cutout emulation, enter landscape, verify transitions both into and out of pip work as intended.
Test: atest ActivityManagerPinnedStackTests
Adrian Roos [Thu, 17 May 2018 15:32:26 +0000 (17:32 +0200)]
WM: Prevent unminimizing docked stack on AOD
When we go to AOD, we hide Home's app token - which causes
the docked stack to unminimize. There was some protection against
that because the same thing happens on the keyguard, but that did
not work because the keyguard state is not aware of AOD. Instead,
we pipe the source of truth from AM down to WM and use this instead.
Change-Id: I68d1079a6bbd9080816ee52c1b5650623a661421
Fixes:
79267409
Test: Enter split screen, go to home, turn of screen, turn on screen. Verify docked stack stays minimized and there is no janky transition
Jorim Jaggi [Fri, 18 May 2018 11:49:56 +0000 (11:49 +0000)]
Merge changes I608d4b61,Ia7900e75 into pi-dev
* changes:
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
Apply surface parameters in sync with RenderThread
Adrian Roos [Thu, 17 May 2018 17:08:21 +0000 (19:08 +0200)]
WM: Perform layout based on the requested flags
When the global system ui visibility changes,
this clears certain sysui flags from windows. However,
if we then use this value to perform layout, we might
lay out the window in a way the app did not expect and
that is not stable during transitions in and out of
full screen.
To fix this, always use the sysUiFl that the app provided
in its window attributes, instead of using the window state's
changing state.
Change-Id: I5f9b3ed37be84553e9e2d912a102675beb6fc11a
Fixes:
76084813
Test: Open Video in browser, enter full screen, play, press home. Verify transition into PiP is smooth.
Jorim Jaggi [Wed, 16 May 2018 21:37:02 +0000 (14:37 -0700)]
Follow up to Ia7900e753b29187a7a7b81f393666687e8b8e04b
Test: Open notification
Bug:
78611607
Change-Id: I608d4b619d5e236c1c874c8c7613f35574d45fd4
Merged-In: I608d4b619d5e236c1c874c8c7613f35574d45fd4
TreeHugger Robot [Fri, 18 May 2018 07:59:58 +0000 (07:59 +0000)]
Merge "Add explicit override for default Private DNS mode" into pi-dev
Kristian Monsen [Fri, 18 May 2018 07:44:55 +0000 (07:44 +0000)]
Merge "Remove most sounds" into pi-dev
Bill Yi [Fri, 18 May 2018 02:15:22 +0000 (19:15 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev am:
abf0ff542a am:
4d58eb3bc1
am:
e388855c62
Change-Id: Ifc6bb00979b4390f099b9c169843a47f94a21235
Bill Yi [Fri, 18 May 2018 02:10:00 +0000 (19:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2 am:
f028e75015 -s ours am:
c22431c753 -s ours
am:
4ec0ca5336 -s ours
Change-Id: I6c275134419ff0a7e8e9d0fec9e7056492416913
Bill Yi [Fri, 18 May 2018 01:56:46 +0000 (18:56 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev am:
c844ea5c96 am:
44042a74c7
am:
5ed1b8864a
Change-Id: Ie3f95b39dfb049f2bdd098866821f3fe5f5fd186
Yifan Hong [Fri, 18 May 2018 01:51:05 +0000 (18:51 -0700)]
fix fingerprint condition on sdk level logic
Change-Id: Icf83c62090943adb32972f08fa4335130ef68291
Fixes:
79950359
Test: fingerprint works
Bill Yi [Fri, 18 May 2018 01:49:54 +0000 (18:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423 am:
f3df46779d -s ours am:
2fe6455d18 -s ours
am:
1531155e0d -s ours
Change-Id: I9a3f23a981837deaa6d26c4acfc11f0c19b9d32e
Bill Yi [Fri, 18 May 2018 01:43:23 +0000 (18:43 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev am:
a86ba9b6e5 am:
7c05674594
am:
08f437f2b4
Change-Id: Ic6c4b5b73064e6e1a0fa1e113caf3c638f09ae5d
Bill Yi [Fri, 18 May 2018 01:37:26 +0000 (18:37 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688 am:
1c6bdf5174 -s ours am:
a1df530ac7 -s ours
am:
407d517cb8 -s ours
Change-Id: If2961de1aeb6216c482b84b9fd00657c8d3e47bb
Bill Yi [Fri, 18 May 2018 01:32:19 +0000 (18:32 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev am:
70060539aa am:
aaddf187e4
am:
1803fec75f
Change-Id: I3f4f5501d41ea3b39ff616c0789f2be7b3ced54b
Bill Yi [Fri, 18 May 2018 01:25:29 +0000 (18:25 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b am:
6959e2b475 -s ours am:
eef34578b3 -s ours
am:
ede8c555e0 -s ours
Change-Id: I0e5265b0cbc53856af61f0f7540ec9c265d28438
Bill Yi [Fri, 18 May 2018 01:14:50 +0000 (18:14 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev am:
abf0ff542a
am:
4d58eb3bc1
Change-Id: I9bdbdaadbe40bba74e9ca9186e88d6881c25e022
Bill Yi [Fri, 18 May 2018 01:09:52 +0000 (18:09 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2 am:
f028e75015 -s ours
am:
c22431c753 -s ours
Change-Id: I186355d9122a1eb12b968ff05e91a631f1189b45
Bill Yi [Fri, 18 May 2018 01:03:39 +0000 (18:03 -0700)]
Merge changes from topic "am-
e925dddc-33b5-48cc-bddb-
e978735e99b7" into oc-dev am:
c844ea5c96
am:
44042a74c7
Change-Id: I39a0f64a8a2cb75fee5d9caf50c249f43637762f
Android Build Merger (Role) [Fri, 18 May 2018 01:00:22 +0000 (01:00 +0000)]
Merge changes from topic "am-
d2edaf8079284e4cb27fcc47cdd92f40" into pi-dev
* changes:
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc am:
1ea636faa9 am:
e5eaa05dd9
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours am:
aa961b929b -s ours am:
1190c6d633 -s ours
Bill Yi [Fri, 18 May 2018 00:59:42 +0000 (17:59 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc am:
1ea636faa9
am:
e5eaa05dd9
Change-Id: I02abac786f8297ff2dfc225d3f93f82bd7904016
Bill Yi [Fri, 18 May 2018 00:58:50 +0000 (17:58 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
2f53cb7cc0 skipped:
ead9437423 am:
f3df46779d -s ours
am:
2fe6455d18 -s ours
Change-Id: Iddb6db689a98d1f569e79da1a96d716c49cdd5e0
TreeHugger Robot [Fri, 18 May 2018 00:55:35 +0000 (00:55 +0000)]
Merge "Do not allow bouncer translation when scrimmed" into pi-dev
Bill Yi [Fri, 18 May 2018 00:53:05 +0000 (17:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours am:
aa961b929b -s ours
am:
1190c6d633 -s ours
Change-Id: I6288d9d8afc635d3465b45b701079738e37f41c9
Bill Yi [Fri, 18 May 2018 00:52:28 +0000 (17:52 -0700)]
Merge changes from topic "am-
3142fca9-100b-4dd4-8848-
117761166ffe" into oc-dev am:
a86ba9b6e5
am:
7c05674594
Change-Id: I8da971740edb6e110fc02bc5ae4e92a3072b3637
TreeHugger Robot [Fri, 18 May 2018 00:51:36 +0000 (00:51 +0000)]
Merge "Fix issue where guts would require bouncer" into pi-dev
Bill Yi [Fri, 18 May 2018 00:47:23 +0000 (17:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
7b2e87bd96 skipped:
913239f688 am:
1c6bdf5174 -s ours
am:
a1df530ac7 -s ours
Change-Id: I06393327f4c6cfd8c5c6e4e17d19e2b21817b040
Calin Juravle [Fri, 18 May 2018 00:45:14 +0000 (00:45 +0000)]
Merge "Allow adb to pull profile snapshots" into pi-dev
Bill Yi [Fri, 18 May 2018 00:42:48 +0000 (17:42 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc am:
5897727afc
am:
8993fe413b
Change-Id: I05a5acac4a59d51d8a76abbde75f69a76f8acac2
Bill Yi [Fri, 18 May 2018 00:41:19 +0000 (17:41 -0700)]
Merge changes from topic "am-
4a0c0e3d-b1ad-44cf-9088-
b37a160bc2ac" into oc-dev am:
70060539aa
am:
aaddf187e4
Change-Id: I674bd5be030c34e37443c8746c40bcae2704e1b2
Bill Yi [Fri, 18 May 2018 00:36:14 +0000 (17:36 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours am:
60682c726c -s ours
am:
ea4170f954 -s ours
Change-Id: I1bb9e3f8b411deaaade34a3e0a8f9c0152f4fc6b
Bill Yi [Fri, 18 May 2018 00:35:54 +0000 (17:35 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
63cef597e2 skipped:
a492d4d55b am:
6959e2b475 -s ours
am:
eef34578b3 -s ours
Change-Id: Ic0a169bd1c11dec7e4bcc8d7a8a2a9ba30d72a6b
Bill Yi [Fri, 18 May 2018 00:30:04 +0000 (17:30 -0700)]
Merge changes from topic "am-
76a20f08-9212-4001-a52b-
dd38a93faa9b" into oc-dev am:
9ede115c2b am:
43539011e4
am:
6aaa85d953
Change-Id: I18a0f5624fca0ff47e28c7a04849ec44fb2c9833
Bill Yi [Fri, 18 May 2018 00:29:10 +0000 (17:29 -0700)]
Merge changes from topic "am-
d375c8a9-01d8-44da-9ef2-
2e866e457b89" into oc-dev am:
e936691bfc
am:
1ea636faa9
Change-Id: I26d60740cd9afc04529a9fb431786c7829ef84f6
Bill Yi [Fri, 18 May 2018 00:23:03 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
053b375862 skipped:
a7875e6a7d am:
81a6ef98f3 -s ours am:
4fb03f2730 -s ours
am:
10a8d67215 -s ours
Change-Id: I43c5a13ff556927a28b931645e197fa09c34b371
Bill Yi [Fri, 18 May 2018 00:23:00 +0000 (17:23 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
439fdb13fc skipped:
a98b588532 am:
1221af165e -s ours
am:
aa961b929b -s ours
Change-Id: Ic0790355c37d9f3501b519dc773466a53f41b3cc
Bill Yi [Fri, 18 May 2018 00:10:29 +0000 (17:10 -0700)]
Merge changes from topic "am-
646cf556-d36a-48f1-a414-
3797586a8a96" into oc-dev am:
ea5a5f49cc
am:
5897727afc
Change-Id: I9fa868feb79839c8090ba44901c09602d48a00d9
Bill Yi [Fri, 18 May 2018 00:09:03 +0000 (17:09 -0700)]
Merge changes from topic "am-
99e79364-ab71-4d96-8a34-
000c07c66d3e" into oc-dev
am:
abf0ff542a
Change-Id: Id3b645350fefaee4071d56d6e4bd368fa535350e
Bill Yi [Fri, 18 May 2018 00:07:45 +0000 (17:07 -0700)]
Merge changes from topic "am-
d1fbdf53-dccb-4215-99ff-
b24698b6bec8" into oc-dev am:
c6c611293d am:
b2f28267ad
am:
8d249b91bd
Change-Id: I98106dea821a12efd704adc279212136971f76bb
Bill Yi [Fri, 18 May 2018 00:07:40 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
c2a85c8927 skipped:
43bd9fa8b2
am:
f028e75015 -s ours
Change-Id: I7415cd61d98275b3d07e17efa2be8026a2a6b6d5
Bill Yi [Fri, 18 May 2018 00:05:08 +0000 (17:05 -0700)]
[automerger skipped] Import translations. DO NOT MERGE skipped:
a574713e4d skipped:
e7c60be83f am:
4bfac58817 -s ours
am:
60682c726c -s ours
Change-Id: I43fa56442b50d3935f9769de2fc22bcfb8f38f6f