OSDN Git Service
Hansong Zhang [Sun, 11 Feb 2018 03:51:00 +0000 (03:51 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am:
37f93de090 am:
8464a40d75 am:
9d938490c8 -s ours
am:
766caa4cf4 -s ours
Change-Id: Ic8c93d7f0abba61ded937756ae2b13888c1007df
Hansong Zhang [Sun, 11 Feb 2018 03:46:46 +0000 (03:46 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am:
37f93de090 am:
8464a40d75
am:
9d938490c8 -s ours
Change-Id: I749181d35395cce99bd0dd9238174603137189fc
Hansong Zhang [Sat, 10 Feb 2018 19:40:11 +0000 (19:40 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev am:
5e84bac2be am:
269eff697d am:
bc02e5f473
am:
71273e2000
Change-Id: If1f054fcd151688b9500675d939ac16451f45e3a
Hansong Zhang [Sat, 10 Feb 2018 19:39:20 +0000 (19:39 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93 am:
c7f5875cf9 am:
a082cc20a9 am:
2bf66f9659
am:
86c0bff53e -s ours
Change-Id: I6a40ebbc7cca24e4b912dce2e86696afc3da4157
Hansong Zhang [Sat, 10 Feb 2018 19:35:45 +0000 (19:35 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev am:
5e84bac2be am:
269eff697d
am:
bc02e5f473
Change-Id: I81dc4bf746192ca995f3160e77c65014f9ee0dd6
Hansong Zhang [Sat, 10 Feb 2018 19:35:04 +0000 (19:35 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93 am:
c7f5875cf9 am:
a082cc20a9
am:
2bf66f9659
Change-Id: Ic27ff1216f3ce343ea532d6fac6c7fe6509ac054
Hansong Zhang [Sat, 10 Feb 2018 19:31:23 +0000 (19:31 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev am:
37f93de090
am:
8464a40d75
Change-Id: Id79a1f421f7a88ccabde0b99af0e5ca32d3b68d0
Hansong Zhang [Sat, 10 Feb 2018 19:30:59 +0000 (19:30 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev am:
5e84bac2be
am:
269eff697d
Change-Id: I11ba57b3e8826a0ed272286105e3262be732d849
Hansong Zhang [Sat, 10 Feb 2018 19:30:30 +0000 (19:30 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93 am:
c7f5875cf9
am:
a082cc20a9
Change-Id: I911f81a88ff9be580e1440f1c21e039ba92c394c
Hansong Zhang [Sat, 10 Feb 2018 19:27:01 +0000 (19:27 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
am:
37f93de090
Change-Id: I9264e3749d75853a97654472216d684c9c71c9ef
Hansong Zhang [Sat, 10 Feb 2018 19:26:35 +0000 (19:26 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
am:
5e84bac2be
Change-Id: I81f3556dc26164969361764f7877635be5010b0a
Hansong Zhang [Sat, 10 Feb 2018 19:25:58 +0000 (19:25 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
am:
c7f5875cf9
Change-Id: I4e8651a4b09314c5df7090009a28752a5661bd32
TreeHugger Robot [Sat, 10 Feb 2018 19:18:10 +0000 (19:18 +0000)]
Merge "DO NOT MERGE Truncate new line characters when adding string to config" into oc-dev
TreeHugger Robot [Sat, 10 Feb 2018 19:17:51 +0000 (19:17 +0000)]
Merge changes from topic "am-
c41d9dbf-12e7-4386-8be3-
987a152ba46e-nyc-dev" into oc-dev
* changes:
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
DO NOT MERGE Truncate new line characters when adding string to config
Jack He [Sat, 10 Feb 2018 02:36:34 +0000 (02:36 +0000)]
Merge "Build: Remove DCHECK_ALWAYS_ON flag" am:
51c084e434 am:
3aa4a236c5
am:
9e73549122
Change-Id: I662569c4da7a96e47799d73d36609386f561ebb4
Jack He [Sat, 10 Feb 2018 02:24:11 +0000 (02:24 +0000)]
Merge "Build: Remove DCHECK_ALWAYS_ON flag" am:
51c084e434
am:
3aa4a236c5
Change-Id: I3a15fe86119c6f89b2efdc71600bf685c4fe1265
Jack He [Sat, 10 Feb 2018 02:03:05 +0000 (02:03 +0000)]
Merge "Build: Remove DCHECK_ALWAYS_ON flag"
am:
51c084e434
Change-Id: Ia3fe3df2c4344d46844df275353668699dc029de
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:08 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f skipped:
f83e8e01f1
Change-Id: I4456e0ddf8aa91bba685033d4e9403bec83bee07
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:06 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e am:
2b25e59f5f
Change-Id: I2764200ea03a976eb679b4e02c4ece61115b1861
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:05 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18 am:
2fb2ce2f4e
Change-Id: If09082226b692af642ce8e1f312e9adb6e0280a6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:04 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97 am:
45c992fd18
Change-Id: I2816fd435f6ffc4366ca02ad5a0beb8d9d795569
Android Build Merger (Role) [Sat, 10 Feb 2018 00:54:03 +0000 (00:54 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
01facbcf97
Change-Id: I3d96331b5aa30717f8e6be3c5fe3a91053e69cee
Hansong Zhang [Fri, 9 Feb 2018 23:23:07 +0000 (15:23 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:51 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44 skipped:
0318638e93
Change-Id: If62106b8704dbebc76e94851a6c63a3ab2072f6f
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:50 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6 am:
cf7272ee44
Change-Id: I2a658c40f43846b7e261233b1e1fb2db4691f9d6
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:48 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2 am:
119a768af6
Change-Id: I606382f75f3ef671f4b651b2396f918a2e97d162
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:47 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb am:
49838a27e2
Change-Id: I35a049b455aa485a29778f3609cc026952975484
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:46 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc am:
f4e92b98bb
Change-Id: I051f65fd35d9cfc6329dc072fb37ab5b3820de93
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:44 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901 skipped:
3dcd4e9bfc
Change-Id: Ia5e49a4cb49329fd3a2e5b687d9e5372f88b35df
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:43 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda am:
1bedd9c901
Change-Id: I17e31eed9ba3a869de51e0c472dd2889bc6a951c
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:41 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88 am:
8b50aeebda
Change-Id: Ia1ab5cc9ce36a3087eff3b7caacab41af9979c18
Android Build Merger (Role) [Sat, 10 Feb 2018 00:52:40 +0000 (00:52 +0000)]
[automerger] DO NOT MERGE Truncate new line characters when adding string to config am:
bb3b4ede88
Change-Id: I338ba0cef8c7b49da0d305a8e2e0217f19acd19c
Hansong Zhang [Fri, 9 Feb 2018 22:21:09 +0000 (14:21 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: Ie7e0b5d93047bc12a9cb84cc15f7f68f38f36441
Jack He [Sat, 10 Feb 2018 00:40:48 +0000 (00:40 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread" am:
199bf77055 am:
fcc5b66613
am:
a259c6f882
Change-Id: I8f2288c9acb19caae85c27fc998e2d36372cbf52
Treehugger Robot [Sat, 10 Feb 2018 00:28:54 +0000 (00:28 +0000)]
Merge "Build: Remove DCHECK_ALWAYS_ON flag"
Jack He [Sat, 10 Feb 2018 00:19:57 +0000 (00:19 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread" am:
199bf77055
am:
fcc5b66613
Change-Id: I00b966c573f3f65407c18b49431e875aebb5caeb
Jack He [Sat, 10 Feb 2018 00:03:21 +0000 (00:03 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread"
am:
199bf77055
Change-Id: Iada4a606411d0811bc60b3fc2cd63ef54e2bcb16
TreeHugger Robot [Fri, 9 Feb 2018 23:39:23 +0000 (23:39 +0000)]
Merge "Truncate new line characters when adding string to config"
Hansong Zhang [Fri, 9 Feb 2018 22:16:59 +0000 (14:16 -0800)]
DO NOT MERGE Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: I8729e12ad5851ee1ffbcb7c08e9a659f768ffc21
Treehugger Robot [Fri, 9 Feb 2018 22:14:27 +0000 (22:14 +0000)]
Merge "A2DP: Construct BtWorkerThread's message loop on designated thread"
Ajay Panicker [Fri, 9 Feb 2018 21:43:05 +0000 (21:43 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab am:
c04bf30f51 am:
d7cf66d304
am:
ee3d6e572f
Change-Id: I007888be0b04857ffd885de99d719653194b37e3
Ajay Panicker [Fri, 9 Feb 2018 21:31:28 +0000 (21:31 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab am:
c04bf30f51
am:
d7cf66d304
Change-Id: Ie634bcf3ee63bc332eb25c26eca734384832673e
Ajay Panicker [Fri, 9 Feb 2018 21:18:18 +0000 (21:18 +0000)]
AVRCP: Check the number of text value attributes requested am:
6313da35ab
am:
c04bf30f51
Change-Id: Ibe9bb37ea975224c7090589e43f25a9455778013
Ajay Panicker [Fri, 9 Feb 2018 21:12:13 +0000 (21:12 +0000)]
AVRCP: Check the number of text value attributes requested
am:
6313da35ab
Change-Id: I7014801c4e9c358f198066aa05b9517cec5526ef
Hansong Zhang [Thu, 8 Feb 2018 22:36:27 +0000 (14:36 -0800)]
Truncate new line characters when adding string to config
Bug:
70808273
Test: test with a device with newline character in name
Change-Id: I20cf26351cf2dae65a6ba4766e0dbfd0c721ddb5
Jack He [Fri, 9 Feb 2018 11:02:46 +0000 (03:02 -0800)]
Build: Remove DCHECK_ALWAYS_ON flag
* According to libchrome documentation, DCHECK_ALWAYS_ON must be set or
unset on both our library and libchrome. Flag mis-match may cause
hard-to-debug segfaults which we experience when using base::Thread
Change-Id: If3740196340b02d2d0bb41e08f0b551d47f49864
Fixes:
73147157
Test: make
Jack He [Thu, 8 Feb 2018 01:33:16 +0000 (17:33 -0800)]
A2DP: Construct BtWorkerThread's message loop on designated thread
* Moves BtWorkerThread's message_loop_'s construction to the
Run() method run by the designated message_loop_thread_ so that
message_loop_'s construction and execution are on the same thread
* Makes BtWorkerThread::StartUp() blocking until message_loop_
starts running using std:condition_variable
* Modify BtWorkerThread::DoInThread() to return boolean
Detail:
Before this CL, BtWorkerThread.message_loop_ is created on Java main
thread and run on message_loop_thread_. During clean-up, A2DP shutdown
message_loop_thread_, rendering the posted_from field in current_pending_task_
invalid. However, although the runner thread is killed, the owner
thread, the Java main thread, is still active. Therefore, we we try to
PostTask() from Java main thread after message_loop_thread_ is killed,
we will try to access an invalid Location object. This results in a
SEGV_MAPPER SEGFAULT. Thus, the fix would be creating and running the
message loop on the same thread so that Java main thread won't have an
invalid message loop after the worker thread is killed.
This can be detected earlier through adding "-DDCHECK_ALWAYS_ON" in both
libchrome and libbluetooth and libchrome will validate the thread for
us.
Fixes:
72831931
Test: Test with DCHECK_ALWAYS_ON in both libbluetooth and libchrome
ProfileServiceTest stress tests
Change-Id: I7b196b8c1113c2758c2b82ddf4d13c46352bb620
Stanley Tng [Fri, 9 Feb 2018 04:45:32 +0000 (04:45 +0000)]
Merge "Prevent spurious connect failures callback" am:
29ff71470e am:
2cbbfd1fdb
am:
81b19d911d
Change-Id: I32a2c49f222fdfb5c40fb7741f4642113b805f6c
Stanley Tng [Fri, 9 Feb 2018 04:40:58 +0000 (04:40 +0000)]
Merge "Prevent spurious connect failures callback" am:
29ff71470e
am:
2cbbfd1fdb
Change-Id: If2312e34e3202755071d1eea8c140349eee79a89
Stanley Tng [Fri, 9 Feb 2018 04:35:55 +0000 (04:35 +0000)]
Merge "Prevent spurious connect failures callback"
am:
29ff71470e
Change-Id: If8b053eaf419f3f44fcb8877f1e0a49f028d43cf
Treehugger Robot [Fri, 9 Feb 2018 04:19:31 +0000 (04:19 +0000)]
Merge "Prevent spurious connect failures callback"
Ajay Panicker [Thu, 11 Jan 2018 00:58:16 +0000 (16:58 -0800)]
AVRCP: Check the number of text value attributes requested
Test: Builds
Bug:
69479009
Change-Id: I184ddfdb56c15c2b07d52a2624240738efb4d207
Jakub Pawlowski [Thu, 8 Feb 2018 20:53:24 +0000 (20:53 +0000)]
btif_rc - make set_volume easier to comprehend am:
884314c1d9 am:
0b21d9f3d7
am:
fbc3305b62
Change-Id: I50f05252f4359265822bbcb8b3331b76b9a14bb4
Jakub Pawlowski [Thu, 8 Feb 2018 20:48:47 +0000 (20:48 +0000)]
btif_rc - make set_volume easier to comprehend am:
884314c1d9
am:
0b21d9f3d7
Change-Id: I119be24e8e98eeb7d5a421f002aea38cc399800a
Jakub Pawlowski [Thu, 8 Feb 2018 20:44:14 +0000 (20:44 +0000)]
btif_rc - make set_volume easier to comprehend
am:
884314c1d9
Change-Id: I71e44ac5ba5bd2762228a87bb6c61c5fb5f824d9
Jakub Pawlowski [Thu, 8 Feb 2018 18:26:35 +0000 (10:26 -0800)]
btif_rc - make set_volume easier to comprehend
Test: compilation
Change-Id: I73c01cb5e3a2da1cdb9acc3b7fe3114f4af7373e
Stanley Tng [Thu, 8 Feb 2018 01:59:04 +0000 (17:59 -0800)]
Prevent spurious connect failures callback
Send connection failures only if the event's mac address matches the
currently bonding device.
Test: Run SL4A "BleCocTest:test_coc_secured_connection_throughput"
Bug:
71364658
Change-Id: I64243996ae37dd376ed36363a7d749b4b5ab36b2
Jakub Pawlowski [Thu, 8 Feb 2018 06:39:13 +0000 (06:39 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it" am:
c0df1edbf1 am:
5bd60e7aa0
am:
49016535a2
Change-Id: I7bb0f49a13689443b83ba7c856c3ed0f84116337
Jakub Pawlowski [Thu, 8 Feb 2018 05:18:19 +0000 (05:18 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it" am:
c0df1edbf1
am:
5bd60e7aa0
Change-Id: I1d22115c5efdef27ad53204cb99f6b50b9e77a46
Jakub Pawlowski [Thu, 8 Feb 2018 05:11:33 +0000 (05:11 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it"
am:
c0df1edbf1
Change-Id: Ic38745138958a7e9c5d58a6e81742deb101c5d43
Jakub Pawlowski [Thu, 8 Feb 2018 05:08:16 +0000 (05:08 +0000)]
Call BTA_GATTS_AddService on correct thread am:
541862ce72 am:
83fd93fd4a
am:
b5547b1f0f
Change-Id: I43f906d9b54be2a7f4d574b85a6ef6dad03c5765
Treehugger Robot [Thu, 8 Feb 2018 05:02:48 +0000 (05:02 +0000)]
Merge "Make sure task_runner is valid when we call PostTask on it"
Jakub Pawlowski [Thu, 8 Feb 2018 02:54:36 +0000 (02:54 +0000)]
Call BTA_GATTS_AddService on correct thread am:
541862ce72
am:
83fd93fd4a
Change-Id: Ib4b1354fdc585684349e7758e7966b0badf3d583
Jakub Pawlowski [Thu, 8 Feb 2018 02:29:01 +0000 (02:29 +0000)]
Call BTA_GATTS_AddService on correct thread
am:
541862ce72
Change-Id: I40487af3885e01b95fddb9f8260992e5995c11b2
Myles Watson [Wed, 7 Feb 2018 23:27:27 +0000 (23:27 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb am:
06c43778c6 am:
ceb758d959
am:
09efb6c6d2
Change-Id: I160774aed701132f9cd4a73552fea9a2d5b9a528
Myles Watson [Wed, 7 Feb 2018 23:00:00 +0000 (23:00 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99 am:
b075bbc371 am:
4ec7f61139
am:
a742d05ed9
Change-Id: Idb29a12ab92b9a3e9b6dde1c9a371e3ba2b19001
Myles Watson [Wed, 7 Feb 2018 22:59:23 +0000 (22:59 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5 am:
47b70de56d am:
d3d6018534
am:
aac795dcbb
Change-Id: Ib90ea4975543718dd0e9f4d973693c2795eeb4ae
Myles Watson [Wed, 7 Feb 2018 22:41:12 +0000 (22:41 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb am:
06c43778c6
am:
ceb758d959
Change-Id: Icb5295dc24e4ed0c3df34e583bdff133d4bf85e7
Myles Watson [Wed, 7 Feb 2018 22:34:32 +0000 (22:34 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99 am:
b075bbc371
am:
4ec7f61139
Change-Id: I58fa5fa2ce5f6f6c3dd11b23673bc1b3ad49cf3c
Myles Watson [Wed, 7 Feb 2018 22:34:00 +0000 (22:34 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5 am:
47b70de56d
am:
d3d6018534
Change-Id: I49d869dec13201dd9e56cd77ba66859e4cd8c993
Myles Watson [Wed, 7 Feb 2018 22:19:37 +0000 (22:19 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884 am:
6bb62e44cb
am:
06c43778c6
Change-Id: Icfebf1a863e7c98bde5f0ca2cf768f89ffcf6123
Myles Watson [Wed, 7 Feb 2018 22:17:00 +0000 (22:17 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev am:
168f4e7d99
am:
b075bbc371
Change-Id: I01c2dd36bacbd99d69ee7a24dc357fb7562e978b
Myles Watson [Wed, 7 Feb 2018 22:16:30 +0000 (22:16 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2 am:
4784e0f9f5
am:
47b70de56d
Change-Id: Ieae594143d0d715e7abba5e43d2713732edd2bda
Myles Watson [Wed, 7 Feb 2018 22:05:00 +0000 (22:05 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev am:
206be7e884
am:
6bb62e44cb
Change-Id: Iab9402f0e133b59728269f28ee85003f96c35997
Myles Watson [Wed, 7 Feb 2018 22:02:19 +0000 (22:02 +0000)]
Merge changes from topic "am-
e4209b1fdb924afeb6b600eabca4a64d" into oc-dev
am:
168f4e7d99
Change-Id: I0001203b9de92b9dbe635fda8b1fd520f559f73c
Myles Watson [Wed, 7 Feb 2018 22:01:39 +0000 (22:01 +0000)]
[automerger] Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr1-dev am:
c6f379e4f2 am:
9cbe0a31a3 am:
c83a890ca2
am:
4784e0f9f5
Change-Id: Id46910eb6b40977461b4ac0148f2f1de24ce1645
Myles Watson [Wed, 7 Feb 2018 22:01:38 +0000 (22:01 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0 am:
113b7d796e am:
914ca8f50b
am:
af6f8cd721
Change-Id: I169db001c884cd568e0ee49c3f59794dfcb7696a
Myles Watson [Wed, 7 Feb 2018 22:01:07 +0000 (22:01 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca am:
3253d77401 am:
4379344a01
am:
46d12654ab
Change-Id: I4286e90dd70058e3c046d702f4796e00f3f2c613
Myles Watson [Wed, 7 Feb 2018 21:58:37 +0000 (21:58 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f am:
e6f7fd7edd am:
4744896602
am:
84be0893f5
Change-Id: Ia2f07032af7db654874ed04f9ea8e6b57b0b3400
Myles Watson [Wed, 7 Feb 2018 21:58:03 +0000 (21:58 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a am:
ba2c15b8c2 am:
e97694d7c9
am:
44eac07694
Change-Id: I8c9a481baad94540534c1a74e70c8c42ea065796
Myles Watson [Wed, 7 Feb 2018 21:57:30 +0000 (21:57 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d am:
a3292e76a4 am:
6a58488cf3
am:
d1c7deef08
Change-Id: I0704d57754096f21f379fcd0b8d6a477aeefd3e9
Myles Watson [Wed, 7 Feb 2018 21:57:22 +0000 (21:57 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0 am:
113b7d796e
am:
914ca8f50b
Change-Id: I05b4f117325a98ed011aff62d11adbdc42e60588
Myles Watson [Wed, 7 Feb 2018 21:56:52 +0000 (21:56 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca am:
3253d77401
am:
4379344a01
Change-Id: Ic8cac997b5b17276df32ee23ce0d6067304ce6dd
Myles Watson [Wed, 7 Feb 2018 21:56:20 +0000 (21:56 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f am:
e6f7fd7edd
am:
4744896602
Change-Id: Ie30e7cb144e786bc2996fa876d85de2902b11747
Myles Watson [Wed, 7 Feb 2018 21:55:35 +0000 (21:55 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a am:
ba2c15b8c2
am:
e97694d7c9
Change-Id: I3230299d5bea33960fd95fc74173e7c4efeaa9ab
Myles Watson [Wed, 7 Feb 2018 21:54:33 +0000 (21:54 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d am:
a3292e76a4
am:
6a58488cf3
Change-Id: I9745438e04d8ed015e773788e3a23260826b4873
Myles Watson [Wed, 7 Feb 2018 21:53:32 +0000 (21:53 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30 am:
136f030d24 am:
ab42c06260 am:
afd761681e
am:
1675a6224f
Change-Id: I147c27324e7126603e6ba2021dea19f091011098
Myles Watson [Wed, 7 Feb 2018 21:51:49 +0000 (21:51 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb am:
02fe8680a0
am:
113b7d796e
Change-Id: I31e3d8e8c5eed0ab992c443a8beb9eeb41866218
Myles Watson [Wed, 7 Feb 2018 21:51:02 +0000 (21:51 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834 am:
a910b735ca
am:
3253d77401
Change-Id: Iab5af3febaef2c0868d33aa5174ed7d84d6486f1
Myles Watson [Wed, 7 Feb 2018 21:50:35 +0000 (21:50 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev am:
d936f1f22f
am:
e6f7fd7edd
Change-Id: I6bf5b9b85b761c3a0ddaa1f80d5e40aa8d9d457a
Myles Watson [Wed, 7 Feb 2018 21:50:22 +0000 (21:50 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr2-dev am:
30b21cde00 am:
b184d4f110 am:
540d8466ca am:
110e369e51
am:
909b89a044
Change-Id: I2bd560b094950c1c852c79d4323f96ae6ef9015b
Myles Watson [Wed, 7 Feb 2018 21:50:05 +0000 (21:50 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into oc-dev am:
50154c463a
am:
ba2c15b8c2
Change-Id: I95a60d89ad6af95e2d6b375c9d2c10274d172972
Myles Watson [Wed, 7 Feb 2018 21:49:49 +0000 (21:49 +0000)]
Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into oc-dev am:
4245009354 am:
189d1b5135 am:
a86cea5d7b
am:
c18f2a2773
Change-Id: Ic4c0ca0f937955afbb8c017acdb46357bce5a470
Myles Watson [Wed, 7 Feb 2018 21:49:35 +0000 (21:49 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-mr1-dev am:
5666c37ad1 am:
dfef16ff78 am:
9cd44cac30 am:
136f030d24 am:
ab42c06260
am:
afd761681e
Change-Id: I344927cd788ff783d09fd7039b29d6881fbceec5
Myles Watson [Wed, 7 Feb 2018 21:49:32 +0000 (21:49 +0000)]
[automerger] Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into nyc-dr1-dev am:
c1f1c627c8 am:
7bed084759 am:
af3f55e2e2 am:
58b9373cc5 am:
0544dc9d0d
am:
a3292e76a4
Change-Id: I9f2cb308de4885fbdd130fe82972a4ba44eca57a
Myles Watson [Wed, 7 Feb 2018 21:49:29 +0000 (21:49 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev
am:
206be7e884
Change-Id: I62e8fd090d35757277d49e0f2d8ad74f600559fa
Myles Watson [Wed, 7 Feb 2018 21:48:21 +0000 (21:48 +0000)]
Merge "Merge changes from topic "am-
821a1757-819d-4571-9800-
4f85fda8b125" into cw-f-dev am:
09c96fcc30" into nyc-mr2-dev am:
83f0c05bcb
am:
02fe8680a0
Change-Id: I4df1b7e1434307e1799abf88c4108083c96307a6
Myles Watson [Wed, 7 Feb 2018 21:47:49 +0000 (21:47 +0000)]
Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into nyc-mr2-dev am:
e285901834
am:
a910b735ca
Change-Id: Ica72ca861c304c1a6921900d38242fe40e1dfcd7
Myles Watson [Wed, 7 Feb 2018 21:47:12 +0000 (21:47 +0000)]
Merge changes from topic "am-
a3017cc6c28740f4a52f9ef5d5b9be0e" into oc-dev
am:
d936f1f22f
Change-Id: I31c1da3e1ca08ac5f697ff344ca067084ada18f8
Android Build Merger (Role) [Wed, 7 Feb 2018 21:46:41 +0000 (21:46 +0000)]
Merge "Merge changes from topic "am-
123d1192465c41d68296e6dc685616c6" into cw-f-dev am:
836d07dd77" into nyc-mr2-dev