OSDN Git Service
Nan Zhang [Fri, 8 Jun 2018 21:15:17 +0000 (14:15 -0700)]
Added online-sdk & off-sdk for Metalava
am:
726df7efc9
Change-Id: I9342a3fa7d845bc7c3b45b4c6ed6a1f888ccb79d
TreeHugger Robot [Fri, 8 Jun 2018 20:24:07 +0000 (20:24 +0000)]
Merge "DO NOT MERGE Update battery stats buffer on wear branch." into pi-wear-dev
Nan Zhang [Fri, 8 Jun 2018 18:50:42 +0000 (11:50 -0700)]
Added online-sdk & off-sdk for Metalava
Test: m -j metalava online-sdk-docs
Bug: b/
78245848
Change-Id: I2cf92b14d20ecb2898e90c5e5956612f49acd33c
Nan Zhang [Fri, 8 Jun 2018 17:50:51 +0000 (10:50 -0700)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
am:
cb3dd2889c
Change-Id: I808d49cf2b00234aa486726d3b7d8db85cd9d63f
Felipe Leme [Fri, 8 Jun 2018 17:32:10 +0000 (10:32 -0700)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
am:
c5b828df68
Change-Id: I09341c589ad8821e5d9fee8823004488cdd8a50f
Nan Zhang [Fri, 8 Jun 2018 17:28:37 +0000 (17:28 +0000)]
Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 17:20:27 +0000 (17:20 +0000)]
Merge "Fixed typo on TextValueSanitizer sample." into pi-dev
Chris Forbes [Fri, 8 Jun 2018 05:23:26 +0000 (22:23 -0700)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
am:
551328eaaa
Change-Id: I4f52821b8eb27f5c63b49bdd52217e399293987e
Chris Forbes [Fri, 8 Jun 2018 05:14:12 +0000 (05:14 +0000)]
Merge "pm: Exposing Vulkan 1.1 does not guarantee AHB extension support" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 05:13:12 +0000 (22:13 -0700)]
Merge "Don't access keyguard from instant apps." into pi-dev
am:
e7bd4e7e8f
Change-Id: I8e26a8d4333aca94fd53297d7322e7743e5728fa
TreeHugger Robot [Fri, 8 Jun 2018 04:49:39 +0000 (04:49 +0000)]
Merge "Don't access keyguard from instant apps." into pi-dev
Adam Powell [Fri, 8 Jun 2018 04:16:12 +0000 (21:16 -0700)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
am:
eaf3590eda
Change-Id: If235aaf384df0ff81902eabe258e0ad7bf72fa8d
Lucas Dupin [Fri, 8 Jun 2018 04:09:46 +0000 (21:09 -0700)]
Merge "Animate owner info during wake-up transition" into pi-dev
am:
c28e772042
Change-Id: Ic1947d435d745307ac7ae844052d8f99774a3632
TreeHugger Robot [Fri, 8 Jun 2018 03:48:21 +0000 (03:48 +0000)]
Merge "Revert "Let sendShowMessage called from hide to show"" into pi-dev
TreeHugger Robot [Fri, 8 Jun 2018 03:38:01 +0000 (03:38 +0000)]
Merge "Animate owner info during wake-up transition" into pi-dev
Svet Ganov [Fri, 8 Jun 2018 03:20:34 +0000 (20:20 -0700)]
Don't access keyguard from instant apps.
Test: cts-instant-tradefed run cts-instant -m CtsViewTestCases
bug:
109652548
Change-Id: I6f8bb714bd98fd53068b2662633a9155d64b274c
Svetoslav Ganov [Fri, 8 Jun 2018 03:15:19 +0000 (20:15 -0700)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
am:
97995da6e1
Change-Id: I745ba50732f695fca3c54658d1ba53d015b09907
TreeHugger Robot [Fri, 8 Jun 2018 03:00:26 +0000 (03:00 +0000)]
Merge "Revert "Allow instant apps to send broadcasts to themselves"" into pi-dev
Benjamin Miller [Fri, 8 Jun 2018 02:44:06 +0000 (19:44 -0700)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
am:
0f5f09844d
Change-Id: Iaf4e49124f0e30d491d24b0a831576d1d35a5d22
TreeHugger Robot [Fri, 8 Jun 2018 02:24:22 +0000 (02:24 +0000)]
Merge "Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS." into pi-dev
Lin Guo [Fri, 8 Jun 2018 02:21:38 +0000 (19:21 -0700)]
Merge changes from topic "volume-change-flags" into pi-dev
am:
a88cf78009
Change-Id: I8ef3832e31f83ced6ef975afa31d100da948c5ad
TreeHugger Robot [Fri, 8 Jun 2018 01:58:10 +0000 (01:58 +0000)]
Merge changes from topic "volume-change-flags" into pi-dev
* changes:
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Comply with the volume callback change
Anarghya Mitra [Fri, 8 Jun 2018 01:01:04 +0000 (18:01 -0700)]
Change Quick Settings to account for branded VPNs.
am:
10422896ed
Change-Id: Ife96e59657005b2627aa82c4f65df3722c57e9f7
Yu-Han Yang [Fri, 8 Jun 2018 00:26:27 +0000 (17:26 -0700)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
am:
a364b3111a
Change-Id: I16ce962a1e86f8ceb2ba9ae26cb9285113f650ca
Lin Guo [Fri, 8 Jun 2018 00:08:30 +0000 (17:08 -0700)]
Only show the volume dialog if the AudioManager.FLAG_SHOW_UI bit is set
Bug:
109841417
Test: manual
Change-Id: Icc803a4b22ceccff7d3e788b9164975a8e395a3b
Anarghya Mitra [Thu, 7 Jun 2018 20:26:14 +0000 (13:26 -0700)]
Change Quick Settings to account for branded VPNs.
Screenshots: https://photos.app.goo.gl/FrnK69TXR86npFmY2
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs
Bug:
109837832
Change-Id: Ie447e6598ff593ff5d14ec8787db82ba39c9ea54
Anthony Chen [Thu, 7 Jun 2018 23:50:20 +0000 (16:50 -0700)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
am:
a0d475a43f
Change-Id: I3d8664f74250bda3737d7851d37af857cb2f7214
Yu-Han Yang [Thu, 7 Jun 2018 23:50:08 +0000 (23:50 +0000)]
Merge "Disable REQUEST_LOCATION from GNSS HAL by default" into pi-dev
Chris Forbes [Thu, 7 Jun 2018 23:41:19 +0000 (16:41 -0700)]
pm: Exposing Vulkan 1.1 does not guarantee AHB extension support
Bug: b/
109875843
Change-Id: Ib53fb1a4f7a5a6c055b575b4d8775f8bd62db7a8
Jorim Jaggi [Thu, 7 Jun 2018 23:40:44 +0000 (16:40 -0700)]
Merge "Move nulling of nextFrameCallback" into pi-dev
am:
e4e9ee7951
Change-Id: Ifa5b678dcea9ffb41290cd1152d6c86a8ab14a90
Michael Wachenschwanz [Thu, 7 Jun 2018 23:31:19 +0000 (16:31 -0700)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
am:
f55cce3008
Change-Id: I8638fa9a7d660a86209344cba2eaea674e465312
Svetoslav Ganov [Thu, 7 Jun 2018 23:23:39 +0000 (23:23 +0000)]
Revert "Allow instant apps to send broadcasts to themselves"
This reverts commit
7b40358fa316038ce6a3243b8706c6f5b7a49536.
Reason for revert: False positive - this works and patch not needed.
bug:
109583877
Change-Id: If708350b03292cfa3bf9841199739e06c82f6c4f
Aarthi Balachander [Thu, 7 Jun 2018 23:04:44 +0000 (16:04 -0700)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
am:
36fc3b1a53
Change-Id: Ic6ee382d2619e3004a1ea4b9bee89d10c7bf7569
Yin-Chia Yeh [Thu, 7 Jun 2018 22:55:12 +0000 (15:55 -0700)]
Merge "Camera: update tonemap image in html doc" into pi-dev
am:
beb11a582a
Change-Id: Ied75d2e19cd9f0b3a5e8cfb8529625e3b9573a5d
Jaewan Kim [Thu, 7 Jun 2018 22:48:55 +0000 (15:48 -0700)]
Merge "MediaSessionService: Fix NPE" into pi-dev
am:
2aac6195e6
Change-Id: Ife9de2cf1eec7537081be01d4903927589bc6919
Yao Chen [Thu, 7 Jun 2018 22:37:53 +0000 (15:37 -0700)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
am:
38b92986df
Change-Id: Ied96dcde94aadfcf5aeda32ce8dd6707f5e2b91f
Hongwei Wang [Thu, 7 Jun 2018 19:35:08 +0000 (12:35 -0700)]
Comply with the volume callback change
Bug:
109841417
Test: m -j
Change-Id: I43a139b97f89a666088db39579b068dc76babd56
TreeHugger Robot [Thu, 7 Jun 2018 22:23:12 +0000 (22:23 +0000)]
Merge "Remove usage of deprecated DayNightStyle values." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 22:14:51 +0000 (22:14 +0000)]
Merge "Move nulling of nextFrameCallback" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:43:50 +0000 (21:43 +0000)]
Merge "Increase Binder Proxy Limit to 6000 for SYSTEM" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:42:59 +0000 (21:42 +0000)]
Merge "Show the bouncer at start up if the headless user flag is set" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 21:33:59 +0000 (21:33 +0000)]
Merge "Camera: update tonemap image in html doc" into pi-dev
Lucas Dupin [Thu, 7 Jun 2018 21:22:23 +0000 (14:22 -0700)]
Merge "Hide backdrop when waking up from fp" into pi-dev
am:
e752b75dad
Change-Id: I9ae8dc2caea8ca9cf3b0936cb094e24d4b82c440
Benjamin Miller [Thu, 7 Jun 2018 19:10:08 +0000 (19:10 +0000)]
Docs: noted that setting proxy hostnames on an ApnSetting requires an internet connection for DNS.
Doc-only change.
Also improved the class descriptions and fixed some typos.
Staged at:
http://go/dac-stage/reference/android/telephony/data/ApnSetting_new
http://go/dac-stage/reference/android/telephony/data/ApnSetting.Builder_new
Bug:
80238372
Test: make ds-docs with visual inspection of generated HTML
Change-Id: Id4a00c1a44dc3cbbaefc94c0438eb1a077f06e5e
Jaewan Kim [Thu, 7 Jun 2018 21:19:03 +0000 (21:19 +0000)]
Merge "MediaSessionService: Fix NPE" into pi-dev
shawnlin [Thu, 7 Jun 2018 21:17:33 +0000 (14:17 -0700)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
am:
0631de5772
Change-Id: Ib794cc43160067916970c04beef3a04ad1d6fb3e
Yao Chen [Thu, 7 Jun 2018 21:10:16 +0000 (21:10 +0000)]
Merge "Disable statsd and make StatsLog no-op if ro.statsd.enable=false" into pi-dev
Benjamin Miller [Thu, 7 Jun 2018 21:06:07 +0000 (14:06 -0700)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
am:
d97f38f69c
Change-Id: Ie5880f548d07e2e73f78e22f26134aeb6cf2dfe5
TreeHugger Robot [Thu, 7 Jun 2018 20:40:33 +0000 (20:40 +0000)]
Merge "Hide backdrop when waking up from fp" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 20:28:36 +0000 (20:28 +0000)]
Merge "Fixed flickering when quick tap on brightness bar" into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 20:18:28 +0000 (13:18 -0700)]
Merge "Add more APIs to light grey list" into pi-dev
am:
208c0ad30f
Change-Id: Iffdbfe98799a8e148bb74736fec4d7f687a68693
Nan Zhang [Thu, 7 Jun 2018 02:11:33 +0000 (19:11 -0700)]
Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs
Test: manually cp stub-annotations.jar to pi-dev; and m -j metalava_android_stubs
Bug: b/
78245848
Change-Id: Ib7ea5d847d50e3c863891e0f59228a40d1b8c41b
Merged-In: I116643925a3a9594e8590c3714e93d0fb0ac372f
Benjamin Miller [Thu, 7 Jun 2018 20:12:43 +0000 (20:12 +0000)]
Merge "docs: Backup requestRestore() doesn't kill app during restore." into pi-dev
Chad Brubaker [Thu, 7 Jun 2018 20:10:17 +0000 (13:10 -0700)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
am:
1af8b4d1f4
Change-Id: I9ef5f466c06630d868d178aa0633616e43d0e2e8
Nicolas Geoffray [Thu, 7 Jun 2018 20:03:42 +0000 (20:03 +0000)]
Merge "Add more APIs to light grey list" into pi-dev
Yu-Han Yang [Thu, 7 Jun 2018 18:58:52 +0000 (11:58 -0700)]
Disable REQUEST_LOCATION from GNSS HAL by default
Bug:
109883154
Fixes:
109883154
Test: manually tested and verified it's disabled.
Change-Id: Ib42a14c776e32d20d79d8ce76a4acdbfa13a70a1
TreeHugger Robot [Thu, 7 Jun 2018 19:48:14 +0000 (19:48 +0000)]
Merge "Do not preload NoPreloadHolder classes" into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 19:45:08 +0000 (19:45 +0000)]
Merge "Change roboto-->sans-serif-regular" into pi-wear-dev
Nicolas Geoffray [Thu, 7 Jun 2018 19:42:43 +0000 (12:42 -0700)]
Merge "One more light grey addition." into pi-dev
am:
ff207fdf86
Change-Id: Icc88807c2fcf8b94310778a024254ddeef751c3b
TreeHugger Robot [Thu, 7 Jun 2018 19:11:12 +0000 (19:11 +0000)]
Merge "One more light grey addition." into pi-dev
Winson Chung [Thu, 7 Jun 2018 19:09:21 +0000 (12:09 -0700)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
am:
c6e4acc222
Change-Id: Id601265dab518fd722b24dac222e86f63fb5dec5
Winson Chung [Thu, 7 Jun 2018 18:59:48 +0000 (18:59 +0000)]
Merge "Consider window background opacity when determining snapshot translucency" into pi-dev
Chad Brubaker [Thu, 7 Jun 2018 18:40:57 +0000 (11:40 -0700)]
Do not preload NoPreloadHolder classes
These classes cannot be statically preloaded in Zygote.
Change-Id: I7d9f10e634409bedfdd71f8daa43b8e23516638e
Fixes:
109652611
Test: atest com.android.cts.devicepolicy.MixedManagedProfileOwnerTest#testCaCertManagement
Winson Chung [Thu, 7 Jun 2018 18:46:47 +0000 (11:46 -0700)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
am:
5d4678e992
Change-Id: Ifaad73b221c8c1745245203fc26e38b2a9d00884
Anthony Hugh [Thu, 7 Jun 2018 18:40:10 +0000 (11:40 -0700)]
Change roboto-->sans-serif-regular
BUG:
71634382
Change-Id: Ifb32031b511771e9261c1307f7e73f1e94851648
TreeHugger Robot [Thu, 7 Jun 2018 18:25:14 +0000 (18:25 +0000)]
Merge "Only use the pre-animation bounds when an animation is running and is set" into pi-dev
Laura Davis [Thu, 7 Jun 2018 18:24:36 +0000 (11:24 -0700)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
am:
b6e3e61850
Change-Id: I5ffd2578d710893f90e837db60238c37fa89e4e0
Laura Davis [Thu, 7 Jun 2018 18:04:16 +0000 (18:04 +0000)]
Merge "docs: Changed language to be gender-neutral." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 17:59:40 +0000 (17:59 +0000)]
Merge "Fix toast for wearables" into pi-wear-dev
Yin-Chia Yeh [Thu, 15 Mar 2018 18:28:20 +0000 (11:28 -0700)]
Camera: update tonemap image in html doc
Bug:
74942037
Merged-In: I6ac4bd9e7a6d9bb2b8e3d1303656c0cdc525178b
Change-Id: I6ac4bd9e7a6d9bb2b8e3d1303656c0cdc525178b
Nicolas Geoffray [Thu, 7 Jun 2018 17:30:49 +0000 (10:30 -0700)]
Merge "Add more light grey APIs." into pi-dev
am:
ac013ae464
Change-Id: Ib1fcb11948bd9fb3d53f1a059e54b496d2e6ba76
Nicolas Geoffray [Thu, 7 Jun 2018 17:23:21 +0000 (18:23 +0100)]
One more light grey addition.
bug:
109833930
Test: m
Change-Id: I0f2079e84827f1ee6425e5a73a135d2401a78443
Michael Wachenschwanz [Wed, 6 Jun 2018 22:04:22 +0000 (15:04 -0700)]
Increase Binder Proxy Limit to 6000 for SYSTEM
Workaround for issue with SysUi creating too many Binder Proxies.
Increasing the limit reduces the chance of a SysUi restart but increases the risk of a misbehaving app consuming system resources
Bug:
109701487
Test: manual (generate 6000 Binder Proxies)
Change-Id: I11929cf41f9126bb095abb095c723dd892a51cb4
TreeHugger Robot [Thu, 7 Jun 2018 17:18:33 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Don't hide IME when keyguard is just occluded." into pi-wear-dev
TreeHugger Robot [Thu, 7 Jun 2018 17:18:27 +0000 (17:18 +0000)]
Merge "DO NOT MERGE Allow windows to show when input restricted." into pi-wear-dev
Pavel Grafov [Thu, 7 Jun 2018 17:17:08 +0000 (10:17 -0700)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
am:
8e0ad6534d
Change-Id: Ibddf85d6ebe1e499a54e0e0c047365ecf81e15c2
Nicolas Geoffray [Thu, 7 Jun 2018 17:14:20 +0000 (17:14 +0000)]
Merge "Add more light grey APIs." into pi-dev
Lucas Dupin [Thu, 7 Jun 2018 17:12:32 +0000 (10:12 -0700)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
am:
cc4efe08de
Change-Id: Ic778018318b89285bc368d6c43aac5b5d211fd9a
Yi Jin [Thu, 7 Jun 2018 17:06:54 +0000 (10:06 -0700)]
Merge "Fix cts." into pi-dev
am:
3e389a8490
Change-Id: I77fcff1e83f33859e0b0cb65a29bfa40827749a9
TreeHugger Robot [Thu, 7 Jun 2018 16:56:25 +0000 (16:56 +0000)]
Merge "Start SecurityLogMonitor after broadcasts are allowed." into pi-dev
TreeHugger Robot [Thu, 7 Jun 2018 16:50:34 +0000 (16:50 +0000)]
Merge "Update scrims when keyguard gets occluded" into pi-dev
Yi Jin [Thu, 7 Jun 2018 16:48:20 +0000 (16:48 +0000)]
Merge "Fix cts." into pi-dev
Andrew Sapperstein [Thu, 7 Jun 2018 16:29:35 +0000 (09:29 -0700)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
am:
bae9b1a71c
Change-Id: If57cc74f41f7294780c0f6f3d534b1c7af877d38
Andrew Sapperstein [Thu, 7 Jun 2018 16:15:57 +0000 (16:15 +0000)]
Merge "Revert "Hide system apps until installed (1/2)"" into pi-dev
David Brazdil [Thu, 7 Jun 2018 15:32:41 +0000 (16:32 +0100)]
Add more APIs to light grey list
Bug:
109869624
Test: m
Change-Id: I3490b8cfba60f0be0c3d464b581ccca637af0549
Jorim Jaggi [Wed, 6 Jun 2018 16:42:16 +0000 (18:42 +0200)]
Move nulling of nextFrameCallback
If draw() invokes postDraw that sets the next callback, the
callback will never be invoked.
Test: Long-swipe-up from navigation bar
Change-Id: If2e4dfff8a845b73fa77426305d5ece1921857e5
Fixes:
109701914
Nicolas Geoffray [Thu, 7 Jun 2018 15:29:48 +0000 (08:29 -0700)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
am:
cc2cbe8dc8
Change-Id: I4b817ff598eea893eb78d9fdfd7f322176850cc2
Nicolas Geoffray [Thu, 7 Jun 2018 15:18:24 +0000 (15:18 +0000)]
Merge "Manual update from a bugbot hidden API comment." into pi-dev
Daniel Sandler [Thu, 7 Jun 2018 14:23:27 +0000 (07:23 -0700)]
Merge "O no, this should be a P." into pi-dev
am:
31cb11324f
Change-Id: I7392d863c935ab64fc6445fca4c3b35352ffcf1f
Daniel Sandler [Thu, 7 Jun 2018 14:14:03 +0000 (14:14 +0000)]
Merge "O no, this should be a P." into pi-dev
Nicolas Geoffray [Thu, 7 Jun 2018 10:50:02 +0000 (11:50 +0100)]
Manual update from a bugbot hidden API comment.
bug:
109761368
Test: m
Change-Id: I65cda12a0c4e48c888d3b08f63f9412b88ac248a
Nicolas Geoffray [Thu, 7 Jun 2018 08:01:23 +0000 (09:01 +0100)]
Add more light grey APIs.
bug:
109841601
Test: m
Change-Id: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Merged-in: I6f43c718a35a534f1b675cc116f2642e6a5b8a18
Pavel Grafov [Wed, 6 Jun 2018 15:11:09 +0000 (16:11 +0100)]
Start SecurityLogMonitor after broadcasts are allowed.
Otherwise if boot takes long enough, DO broadcast will be sent while
ActivityManagerSerivce is not ready, causing IllegalStateException.
Change-Id: I6b55ed45ed7b1f3ed9ad6ec20695907b4fa6f3b1
Fixes:
109746888
Test: atest CtsDevicePolicyManagerTestCases:com.android.cts.devicepolicy.DeviceOwnerTest#testSecurityLoggingWithSingleUser
Test: provisioned TestDPC as DO in SuW, enabled logging.
Ryan Mitchell [Thu, 7 Jun 2018 06:05:27 +0000 (23:05 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours am:
35dfd46378 -s ours
am:
a76360ddf1 -s ours
Change-Id: I91dddfd8a038bcd353769b7173e2864caab2d046
Ryan Mitchell [Thu, 7 Jun 2018 05:52:56 +0000 (22:52 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8 am:
366031e336
am:
5dcf0e0f65
Change-Id: I5caded1c61d9e0a45b9aaa4db37493b2cd1a6c2b
Ryan Mitchell [Thu, 7 Jun 2018 05:24:04 +0000 (22:24 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac am:
53ff808f99 -s ours
am:
35dfd46378 -s ours
Change-Id: Icc7661bca07e16f0b230b35ab7f1df8f0d8a8189
Dan Sandler [Thu, 7 Jun 2018 05:08:34 +0000 (01:08 -0400)]
O no, this should be a P.
Bug:
109804872
Test: none
Change-Id: Ibd6aac069a254a7d5a190e1f4476ba2c4124a758
Ryan Mitchell [Thu, 7 Jun 2018 04:26:05 +0000 (21:26 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8 am:
dff068e1e8
am:
366031e336
Change-Id: I815ba23c884d6891b2acba23687db0d4d1cab98a
Ryan Mitchell [Thu, 7 Jun 2018 04:19:51 +0000 (21:19 -0700)]
[automerger skipped] Merge changes from topic "dynamic-ref-se-mnc-dev" into oc-dev am:
2d31069fac
am:
53ff808f99 -s ours
Change-Id: Ia9736d803a7b980bafb5b55d76c99a7ee29c68c3
Ryan Mitchell [Thu, 7 Jun 2018 03:49:18 +0000 (20:49 -0700)]
Merge changes from topic "am-
c1e91e5e-2686-4871-b188-
107c0ddf3273" into oc-dev am:
075bcf73c8
am:
dff068e1e8
Change-Id: I562e53f089ca19fc145a34fb539556ae92d05722
OSDN Git Service
