OSDN Git Service
Svetoslav Ganov [Fri, 28 Jul 2017 05:46:53 +0000 (05:46 +0000)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reported
for normal and dangerous permissions
Change-Id: I87b10a7695d8ecfa7156525d6f3d101fc0639513
bug:
62755026
Bart Sears [Fri, 28 Jul 2017 05:05:38 +0000 (05:05 +0000)]
Revert "Report permission flags for all protections based on SDK"
This reverts commit
852cf98cb8a4b9b56da84a96708c087996e119d2.
Change-Id: I62763bf85ec95a02a245c6b503aa34bb0e9d997a
Svetoslav Ganov [Thu, 27 Jul 2017 19:53:18 +0000 (12:53 -0700)]
Report permission flags for all protections based on SDK
We added a couple of protection flags that also apply to
normal and dangerous permissions. These flags are folded
in the protection level breaking apps that directly and
compare against the protection constants. Apps that target
older than O SDK don't get protection flags folded into
the protection level.
Test: All permission tests pass
Added a new test to ensure no protection flags reproted
for normal and dangerous permissions
bug:
62755026
Change-Id: I72547b0146e6b6919803e33ff64b7208c4a255ad
Bill Yi [Wed, 26 Jul 2017 23:10:06 +0000 (23:10 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
581a166ae1 -s ours
am:
603a43e5c3 -s ours
Change-Id: I57e366359829001bd92fa0b77d8068cb30c18456
Bill Yi [Wed, 26 Jul 2017 23:07:26 +0000 (23:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fb02073a66 -s ours
am:
9cf9d294ef -s ours
Change-Id: I559573199120374e303bfaae5d5c18660dbb369e
Bill Yi [Wed, 26 Jul 2017 22:56:00 +0000 (22:56 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
581a166ae1 -s ours
Change-Id: If1bba4f6237b39c86fc5fa998376683d78cd483e
Bill Yi [Wed, 26 Jul 2017 22:55:38 +0000 (22:55 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
4ba2bc4d32 -s ours
am:
8080362358 -s ours
Change-Id: I8243f6ee311cd730ace4f9bca4693ccdabfa7523
Bill Yi [Wed, 26 Jul 2017 22:52:44 +0000 (22:52 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
3875d1a103 -s ours
Change-Id: Ife54f4e800fd4b81c5639984937096945f063d1d
Bill Yi [Wed, 26 Jul 2017 22:49:37 +0000 (22:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
c2b08ca602 -s ours
Change-Id: I0c8c1cc35fa6560dd1a40b22544ecd25dc7af0b2
Bill Yi [Wed, 26 Jul 2017 22:46:32 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fb02073a66 -s ours
Change-Id: I497f27dc7f50f9914b5157a4846c05ef4091abfd
Bill Yi [Wed, 26 Jul 2017 22:44:26 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9724569903 -s ours
Change-Id: I8bcfd139861eb4ca6a0943e321b8032245e27a42
TreeHugger Robot [Wed, 26 Jul 2017 22:40:12 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:39:47 +0000 (22:39 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
am:
cd955ca6e5 -s ours
Change-Id: I643ac51ad7d162527ee4aa73da6568d94156083b
TreeHugger Robot [Wed, 26 Jul 2017 22:39:30 +0000 (22:39 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 22:35:23 +0000 (22:35 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
am:
3bcdbff889 -s ours
Change-Id: Id70f146241685a88bc2ba075d8e78745fd826878
Bill Yi [Wed, 26 Jul 2017 22:28:59 +0000 (22:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
a1bde91384 -s ours
Change-Id: Ic47dfa6fc6cad6123552c0493f40d3ac9a63822c
Bill Yi [Wed, 26 Jul 2017 22:25:46 +0000 (22:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am:
9bc30ce545 -s ours
Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935
Bill Yi [Wed, 26 Jul 2017 22:21:36 +0000 (22:21 +0000)]
Import translations. DO NOT MERGE
am:
495d4ce1b9 -s ours
Change-Id: I1294580d3e9485f0367aca366054336d0dc3b9ed
Bill Yi [Wed, 26 Jul 2017 22:21:32 +0000 (22:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4ba2bc4d32 -s ours
Change-Id: Ib331eb4cf8882b271b11b756c43818a5b38c1664
TreeHugger Robot [Wed, 26 Jul 2017 22:16:34 +0000 (22:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:14:51 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 22:13:05 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Android Build Merger (Role) [Wed, 26 Jul 2017 22:04:23 +0000 (22:04 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am:
fbfd283125 -s ours" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 22:01:57 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
fbfd283125 -s ours
Change-Id: I39f298c62ae870a0a764a1cb60d766e8e03f692b
Android Build Merger (Role) [Wed, 26 Jul 2017 22:01:37 +0000 (22:01 +0000)]
Merge "Import translations. DO NOT MERGE am:
69d0838208 -s ours" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:59:35 +0000 (21:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Wed, 26 Jul 2017 21:58:32 +0000 (21:58 +0000)]
Import translations. DO NOT MERGE
am:
69d0838208 -s ours
Change-Id: I25641bf4fbc60d8e40887a43965a602000bc8377
TreeHugger Robot [Wed, 26 Jul 2017 21:50:54 +0000 (21:50 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:48:22 +0000 (21:48 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Wed, 26 Jul 2017 21:36:36 +0000 (21:36 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Wed, 26 Jul 2017 18:03:33 +0000 (11:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: I228aaf428e6298a9077e8f277c3e6e26b5ebd7a3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:02:05 +0000 (11:02 -0700)]
Import translations. DO NOT MERGE
Change-Id: I13f52e0726334b4ff47a780e3d5c41074d96aada
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:01:07 +0000 (11:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8b8dd3e35096ba23f1dd7cc01beba7b392167591
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 18:00:00 +0000 (11:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfe4076b754c857472076b3aa9d9fd0b491e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:57:20 +0000 (10:57 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9be29c557742c6c1d233376f49088bcb3309bfb3
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:42:20 +0000 (10:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9273d1c9e96d398653e3846dcdfdf2df5a070a57
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:40:40 +0000 (10:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6893b7757cc431a56096d7c708f600d3f2f8575
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:39:26 +0000 (10:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: I954a10e182672bd56b02906d530f0415a1704160
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:37:56 +0000 (10:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8a3ec819ac8f50463c32225f68031c92d9fc8eec
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:36:27 +0000 (10:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I788dbd4e193bfb2bae69e37fd18becd482a42917
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 17:23:59 +0000 (10:23 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7a677eabfe97553a7bddecfa88064d5e4edd37b6
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
David Friedman [Fri, 21 Jul 2017 23:01:56 +0000 (23:01 +0000)]
Merge "Docs: Updates guidance about using permissions when accessing OBB expansion files, Bug:
34273998 Test: Ran "make" to verify error-free building." into oc-dev
Benjamin Miller [Thu, 20 Jul 2017 13:58:15 +0000 (13:58 +0000)]
Merge "Docs-change: how UserManager.ENSURE_VERIFY_APPS affects profiles." into oc-dev
Dave Friedman [Wed, 5 Jul 2017 07:40:07 +0000 (00:40 -0700)]
Docs: Updates guidance about using permissions when accessing OBB
expansion files,
Bug:
34273998
Test: Ran "make" to verify error-free building.
Change-Id: Ic2022bd8bd78e2f6077d6ee6807fbbda7214737a
Ricardo Loo [Wed, 19 Jul 2017 04:36:42 +0000 (04:36 +0000)]
Merge "docs: Updated #ACTION_REQUEST_SET_AUTOFILL_SERVICE description" into oc-dev
Phil Weaver [Wed, 19 Jul 2017 01:10:58 +0000 (01:10 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d am:
a84f7a3028
am:
72c56fb84a -s ours
Change-Id: Ib0b35737306bce22a49bddeea0d7abdc8ecb1bc3
Phil Weaver [Wed, 19 Jul 2017 01:01:06 +0000 (01:01 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev am:
4a1dc3458d
am:
a84f7a3028
Change-Id: I1fedbee4642373e41c63c36ab83a0f4629c4a3d1
Phil Weaver [Wed, 19 Jul 2017 00:53:13 +0000 (00:53 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
am:
4a1dc3458d
Change-Id: Ibc50787c078b4d68de37f12d57d4b14990b5c768
Phil Weaver [Wed, 19 Jul 2017 00:46:42 +0000 (00:46 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-mr1-dev
Phil Weaver [Wed, 19 Jul 2017 00:42:05 +0000 (00:42 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a am:
2da30457c5
am:
d761dad216
Change-Id: Ib2704ba352764d6f48467c129b2a2d4129408da0
Phil Weaver [Wed, 19 Jul 2017 00:30:58 +0000 (00:30 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3 am:
edbe4bd86a
am:
2da30457c5
Change-Id: If6d698d3d085c8a49a4b58ae5cc5005264558091
Phil Weaver [Wed, 19 Jul 2017 00:24:23 +0000 (00:24 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548 am:
afdcad0df3
am:
edbe4bd86a
Change-Id: I860d4a27acab50bfebf81e83b3db64f7c396fade
Phil Weaver [Wed, 19 Jul 2017 00:15:34 +0000 (00:15 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours am:
9e39e1e548
am:
afdcad0df3
Change-Id: Ie777e6351ed8518a4fc785a20772a8e2cb0ef0fe
Phil Weaver [Wed, 19 Jul 2017 00:04:51 +0000 (00:04 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4 am:
996bc6bc12 -s ours
am:
9e39e1e548
Change-Id: I04ba3782f29c89032d498c5e2ef292605a66ac9f
Phil Weaver [Tue, 18 Jul 2017 23:58:28 +0000 (23:58 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714 am:
9625d164e4
am:
996bc6bc12 -s ours
Change-Id: Iccbeb4cec6e40c00e7f875b5e3faa94772f1b819
Phil Weaver [Tue, 18 Jul 2017 23:41:26 +0000 (23:41 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56 am:
0ddd7e4714
am:
9625d164e4
Change-Id: I0aa09448467dae806c9c5670ba8ed77e95a59da1
Phil Weaver [Tue, 18 Jul 2017 23:35:25 +0000 (23:35 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev am:
093c7a8e56
am:
0ddd7e4714
Change-Id: If39e3e66871aed33dfa0a9949cfd70a7ec45231f
Phil Weaver [Tue, 18 Jul 2017 23:28:55 +0000 (23:28 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
am:
093c7a8e56
Change-Id: I7f734c7878cf065d15335602f9b0a6e02a786d53
Phil Weaver [Tue, 18 Jul 2017 23:21:16 +0000 (23:21 +0000)]
Merge "Back-port fixes for b/
62196835" into mnc-dev
Phil Weaver [Wed, 12 Jul 2017 21:04:16 +0000 (14:04 -0700)]
Back-port fixes for b/
62196835
Bug:
62196835
Test: Created an accessibility service that displays a system
and a toast overlay, confirmed that it disappeared when we
reached the accessibility permission screen that uses this
flag.
Change-Id: Ic51ead670fc480e549512ba1d02f49d9c13bc3f0
Phil Weaver [Tue, 18 Jul 2017 22:26:36 +0000 (22:26 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390 am:
fef2328f35
am:
713a5420dd
Change-Id: Ib3e9b5d8c8807a5e7f41f94d127008fc4f255f3e
Phil Weaver [Tue, 18 Jul 2017 22:19:02 +0000 (22:19 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours am:
2a93c3d390
am:
fef2328f35
Change-Id: Ifc093c5a322bdb94717cfaebe9a9bab255e22789
Phil Weaver [Tue, 18 Jul 2017 22:03:40 +0000 (22:03 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8 am:
4fa8b51c0c -s ours
am:
2a93c3d390
Change-Id: I11d0935ed851e3c6076fb972a721d42e4903c6de
Phil Weaver [Tue, 18 Jul 2017 21:59:29 +0000 (21:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f am:
ac700bc3c7
am:
cfbe89ad32 -s ours
Change-Id: I20741c5be51498f1d9a44452784fa59d31a12b2e
Phil Weaver [Tue, 18 Jul 2017 21:55:27 +0000 (21:55 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev am:
0b0834fbe8
am:
4fa8b51c0c -s ours
Change-Id: I72897fd488d26ed7c3e1462c1755e10d2b7dfbe8
Phil Weaver [Tue, 18 Jul 2017 21:50:57 +0000 (21:50 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c am:
b2e3fb162f
am:
ac700bc3c7
Change-Id: If57bab0ee9d5459286339845284adb3f0163c401
Phil Weaver [Tue, 18 Jul 2017 21:50:05 +0000 (21:50 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db am:
d2c4007d8a
am:
982cf0d212 -s ours
Change-Id: Ia2a716d38e67874beb146f12849dd2f3f1356903
Phil Weaver [Tue, 18 Jul 2017 21:44:32 +0000 (21:44 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
am:
0b0834fbe8
Change-Id: Ie3ade206625af7f69d497935397cd3094a1555fb
Phil Weaver [Tue, 18 Jul 2017 21:43:45 +0000 (21:43 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69 am:
783253f6db
am:
d2c4007d8a
Change-Id: I9c749eb931db880073de06259232f5f03c91cd32
Phil Weaver [Tue, 18 Jul 2017 21:40:14 +0000 (21:40 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f am:
27ad1fbc2c
am:
b2e3fb162f
Change-Id: Ia38cf0592fed9cbf5e83a0163083bcd31d065e7e
Phil Weaver [Tue, 18 Jul 2017 21:27:11 +0000 (21:27 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957 am:
79c476704f
am:
faded53018
Change-Id: I2ba2b1380a91ee398ae65baa8b112bf9c3c3768c
Phil Weaver [Tue, 18 Jul 2017 21:27:06 +0000 (21:27 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours am:
bbb567757f
am:
27ad1fbc2c
Change-Id: I5830c0f6d5377717e175c1c90360e0487ef37b42
Phil Weaver [Tue, 18 Jul 2017 21:24:29 +0000 (21:24 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae am:
aa8976fa69
am:
783253f6db
Change-Id: Iad10dcb9d92660a20c5db0450da6edd3cc2df329
Phil Weaver [Tue, 18 Jul 2017 21:23:16 +0000 (21:23 +0000)]
Merge "Back-port fixes for b/
62196835" into nyc-dev
Phil Weaver [Tue, 18 Jul 2017 21:18:42 +0000 (21:18 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e am:
a1dca32957
am:
79c476704f
Change-Id: I38051f6f359f780d421384a01ac578f51ca13e63
Phil Weaver [Tue, 18 Jul 2017 21:18:16 +0000 (21:18 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94 am:
7e82d6204f -s ours
am:
bbb567757f
Change-Id: I7b4397bda68b12219b7494948b8d021fa95f072b
Phil Weaver [Tue, 18 Jul 2017 21:14:49 +0000 (21:14 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours am:
f44b48acae
am:
aa8976fa69
Change-Id: Iff6ad10a9704d09d00c693c074abbb3cd4e49c9e
Phil Weaver [Tue, 18 Jul 2017 21:13:40 +0000 (21:13 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c am:
b968d99e3e
am:
a1dca32957
Change-Id: I5fdeb9f94184dcba41d7e00c129c986d8d1febb9
Phil Weaver [Tue, 18 Jul 2017 21:09:40 +0000 (21:09 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d am:
cf7ce06abd -s ours
am:
f44b48acae
Change-Id: I855599f5d38735e7356c01e753e67c1dc31f1dad
Phil Weaver [Tue, 18 Jul 2017 21:07:43 +0000 (21:07 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4 am:
5264237c94
am:
7e82d6204f -s ours
Change-Id: Ieb56ecb0867261e487f92fd5cdf845c99d577d78
Phil Weaver [Tue, 18 Jul 2017 21:07:11 +0000 (21:07 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89 am:
83261a8b5c
am:
b968d99e3e
Change-Id: I0ea936af7cd1c217d509fa56367a4260e5dab81a
Phil Weaver [Tue, 18 Jul 2017 21:00:36 +0000 (21:00 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb am:
f05a6fc52d
am:
cf7ce06abd -s ours
Change-Id: Ibef3aded20e00e9beef1ec189f1a471d978354e2
Phil Weaver [Tue, 18 Jul 2017 20:59:54 +0000 (20:59 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c am:
68f7106cf4
am:
5264237c94
Change-Id: I6ca7d132a0df35af8763c3cb7baee375bfb6b178
Phil Weaver [Tue, 18 Jul 2017 20:59:49 +0000 (20:59 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed am:
62eca82f89
am:
83261a8b5c
Change-Id: I5fd8c6c844aa52d301fbbbc5dbcf4d5996e0fcf8
Phil Weaver [Tue, 18 Jul 2017 20:55:18 +0000 (20:55 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e am:
e11e076fed
am:
62eca82f89
Change-Id: I9a274bfc59f545076adeb2a82cde269457eecc67
Phil Weaver [Tue, 18 Jul 2017 20:55:02 +0000 (20:55 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240 am:
219d9b5dfb
am:
f05a6fc52d
Change-Id: I3070db9b698328aa5778fa14825eba526a6a1b33
Phil Weaver [Tue, 18 Jul 2017 20:53:07 +0000 (20:53 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours am:
5d46833d9c
am:
68f7106cf4
Change-Id: I19110cf28c6fda3fe3f8857bd8590a6a24ade91e
Phil Weaver [Tue, 18 Jul 2017 20:51:15 +0000 (20:51 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5 am:
e06843fe7e
am:
e11e076fed
Change-Id: Ide9b723cf1a31f8fd8b8f5ae848c3cd73c6a12b5
Phil Weaver [Tue, 18 Jul 2017 20:46:29 +0000 (20:46 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours am:
76007bb240
am:
219d9b5dfb
Change-Id: I1973a5936ceda80873ee03886b64905d46dc6623
Phil Weaver [Tue, 18 Jul 2017 20:44:05 +0000 (20:44 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e am:
37cf6265db -s ours
am:
5d46833d9c
Change-Id: I6b332afcc0e73fb8eddc27585c08da900c4f9ba4
Phil Weaver [Tue, 18 Jul 2017 20:44:03 +0000 (20:44 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours am:
68efc2e5b5
am:
e06843fe7e
Change-Id: I0faad26b07ab16c7b853b2bbe3eb1304ba70d6f2
Phil Weaver [Tue, 18 Jul 2017 20:38:43 +0000 (20:38 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1 am:
ccbac7e9e0 -s ours
am:
76007bb240
Change-Id: I143ebc6b57fe5c458e373dad1ac566f5d419aef2
Phil Weaver [Tue, 18 Jul 2017 20:35:51 +0000 (20:35 +0000)]
Back-port fixes for b/
62196835 am:
fd0ca151a6 am:
3c4d24923c -s ours
am:
68efc2e5b5
Change-Id: I4bb03e87b259faa45a8a2511d05c340f20fe2a6e
Phil Weaver [Tue, 18 Jul 2017 20:30:39 +0000 (20:30 +0000)]
Merge "DO NOT MERGE Back-port fixes for b/
62196835" into lmp-dev am:
a620b21828 -s ours am:
954deb1c6e
am:
37cf6265db -s ours
Change-Id: I28f848331e5379736dd777995fe844aa5c5df689
Phil Weaver [Tue, 18 Jul 2017 20:28:22 +0000 (20:28 +0000)]
DO NOT MERGE Back-port fixes for b/
62196835 am:
24fdc53cfe -s ours am:
ff115bffb1
am:
ccbac7e9e0 -s ours
Change-Id: I28a499e21a6a6d6a4df26317712c09f658383d37
OSDN Git Service
