OSDN Git Service

android-x86/frameworks-base.git
7 years agoExtending DNS event reporting am: f82d1596ce am: 3156b53fbe am: c1ca63e8cb
Michal Karpinski [Thu, 27 Oct 2016 15:27:36 +0000 (15:27 +0000)]
Extending DNS event reporting am: f82d1596ce am: 3156b53fbe am: c1ca63e8cb
am: 6b5c634752

Change-Id: Id7b964d1d0ec70957b79eac98cda24b145eea79e

7 years agoMerge "radio: fix 64 bit process compatibility"
Eric Laurent [Thu, 27 Oct 2016 15:23:04 +0000 (15:23 +0000)]
Merge "radio: fix 64 bit process compatibility"

7 years agoMerge "Implement getTransparentRegion() using SkLatticeIter"
TreeHugger Robot [Thu, 27 Oct 2016 14:13:15 +0000 (14:13 +0000)]
Merge "Implement getTransparentRegion() using SkLatticeIter"

7 years agoExtending DNS event reporting am: f82d1596ce am: 3156b53fbe
Michal Karpinski [Thu, 27 Oct 2016 13:30:02 +0000 (13:30 +0000)]
Extending DNS event reporting am: f82d1596ce am: 3156b53fbe
am: c1ca63e8cb

Change-Id: I5c3a43d9835900e849da6db2a895c0131f19d538

7 years agoExtending DNS event reporting am: f82d1596ce
Michal Karpinski [Thu, 27 Oct 2016 13:20:31 +0000 (13:20 +0000)]
Extending DNS event reporting am: f82d1596ce
am: 3156b53fbe

Change-Id: I14dfa7508c7115b0e60836b3788c421068b70946

7 years agoExtending DNS event reporting
Michal Karpinski [Thu, 27 Oct 2016 13:12:29 +0000 (13:12 +0000)]
Extending DNS event reporting
am: f82d1596ce

Change-Id: I2e39caad0074be519640b561201f75d6685c01ef

7 years agoImplement getTransparentRegion() using SkLatticeIter
Matt Sarett [Tue, 25 Oct 2016 22:36:39 +0000 (18:36 -0400)]
Implement getTransparentRegion() using SkLatticeIter

This allows us to delete utils/NinePatchImpl.cpp and
utils/NinePatch.h

Test: Passed cts tests - DrawableTest, NinePatchTest,
NinePatchDrawableTest.

Change-Id: I6b5d09fa3479e758d8b931fa0e977c25f4435a7c

7 years agoMerge "Remove use of refSkPixelRef"
Diego Perez [Thu, 27 Oct 2016 10:15:39 +0000 (10:15 +0000)]
Merge "Remove use of refSkPixelRef"

7 years agoExtending DNS event reporting
Michal Karpinski [Tue, 27 Sep 2016 16:13:57 +0000 (17:13 +0100)]
Extending DNS event reporting

This adds hostname, array of addresses, total count of IP addresses
and uid to the existing pipeline.
Currently ignores the new data it receives, further work will be
done in the subsequent CLs.

Test: for now just the benchmarking, in the future unit and CTS

(cherry picked from commit 14c9d2d0df7fab2b0470c3c404f600d87d4f0f93)

Bug: 29748723
Change-Id: Ice7db208282934e74f0e1808ffbae96d476c4216

7 years agoMerge "Refactor stack removal methods"
Andrii Kulian [Thu, 27 Oct 2016 07:52:03 +0000 (07:52 +0000)]
Merge "Refactor stack removal methods"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours...
Bill Yi [Thu, 27 Oct 2016 05:34:10 +0000 (05:34 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac  -s ours am: 3b2c3fe5ef  -s ours am: ea109fa2c7  -s ours
am: 3882273957  -s ours

Change-Id: Ifbad3f8490583242e7d80397b5f3b975e88d0830

7 years agoImport translations. DO NOT MERGE am: 1377e2b985 -s ours am: df305805c6 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:33:20 +0000 (05:33 +0000)]
Import translations. DO NOT MERGE am: 1377e2b985  -s ours am: df305805c6  -s ours am: 51521f2e18  -s ours
am: 973a754296  -s ours

Change-Id: Ief6e6da91a2a7745eb8092c211fdb7ba82b836ba

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:32:22 +0000 (05:32 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45  -s ours am: d557ea9388  -s ours am: 0141333d25  -s ours
am: 63b7b89c96  -s ours

Change-Id: I33df334e2fa701cc015e8125c5e2500df826936f

7 years agoImport translations. DO NOT MERGE am: d1b8917270 -s ours am: 6296c78ee4 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:31:22 +0000 (05:31 +0000)]
Import translations. DO NOT MERGE am: d1b8917270  -s ours am: 6296c78ee4  -s ours am: 044be18ae4  -s ours
am: 901527ccef  -s ours

Change-Id: I8db225d899925c52922f41825183b043f866fc6f

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours am...
Bill Yi [Thu, 27 Oct 2016 05:30:32 +0000 (05:30 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5  -s ours am: f0a5ebb129  -s ours
am: 1ef4b78ca3  -s ours

Change-Id: Idc0912b1f378417d5823f97701f8496755db6377

7 years agoImport translations. DO NOT MERGE am: bff09ae3c8 -s ours am: 305004ba4d -s ours
Bill Yi [Thu, 27 Oct 2016 05:29:41 +0000 (05:29 +0000)]
Import translations. DO NOT MERGE am: bff09ae3c8  -s ours am: 305004ba4d  -s ours
am: 7abc47da41  -s ours

Change-Id: Ib4a3c8cc185c893f478ad8858fc7b5c61eb6c084

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2 -s ours am...
Bill Yi [Thu, 27 Oct 2016 05:28:52 +0000 (05:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2  -s ours am: 6b8d9b2337  -s ours
am: 269392893b  -s ours

Change-Id: I7b79f8e1d1052b53e3cb605f330a15c105f52a35

7 years agoImport translations. DO NOT MERGE am: 644a22437f -s ours am: 316c6df269 -s ours
Bill Yi [Thu, 27 Oct 2016 05:28:04 +0000 (05:28 +0000)]
Import translations. DO NOT MERGE am: 644a22437f  -s ours am: 316c6df269  -s ours
am: ce37c7b14f  -s ours

Change-Id: Ie696fc1f7d83b172e5859e9f82498882d5460d21

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours...
Bill Yi [Thu, 27 Oct 2016 05:25:03 +0000 (05:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac  -s ours am: 3b2c3fe5ef  -s ours
am: ea109fa2c7  -s ours

Change-Id: I0db2a437d7449ebb7791c10615c248e1640cc132

7 years agoMerge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d...
Android Build Merger (Role) [Thu, 27 Oct 2016 05:24:48 +0000 (05:24 +0000)]
Merge "Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev am: d37981be5a  -s ours am: 64d92dc381  -s ours"

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
Bill Yi [Thu, 27 Oct 2016 05:24:13 +0000 (05:24 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev am: d37981be5a  -s ours
am: 64d92dc381  -s ours

Change-Id: Ib1ddc2a0926bea50e29b4e3ef7cb098a5e94823e

7 years agoImport translations. DO NOT MERGE am: 1377e2b985 -s ours am: df305805c6 -s ours
Bill Yi [Thu, 27 Oct 2016 05:24:09 +0000 (05:24 +0000)]
Import translations. DO NOT MERGE am: 1377e2b985  -s ours am: df305805c6  -s ours
am: 51521f2e18  -s ours

Change-Id: I4e07de2591fe8fbc4c8512fb47807aa434ab9a5a

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
Android Build Merger (Role) [Thu, 27 Oct 2016 05:23:56 +0000 (05:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours am: 38948cf86d  -s ours am: d7546218b5  -s ours"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours...
Bill Yi [Thu, 27 Oct 2016 05:23:23 +0000 (05:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours am: 38948cf86d  -s ours
am: d7546218b5  -s ours

Change-Id: Ib981dac3521a620263725bd684bb9ea618b0b966

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:23:21 +0000 (05:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45  -s ours am: d557ea9388  -s ours
am: 0141333d25  -s ours

Change-Id: I12544624bd86847af3528ec3f932d1442fee8f59

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a...
Android Build Merger (Role) [Thu, 27 Oct 2016 05:23:07 +0000 (05:23 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a  -s ours am: 521faf362a  -s ours"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a -s ours
Bill Yi [Thu, 27 Oct 2016 05:22:34 +0000 (05:22 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 50f02f9d0a  -s ours
am: 521faf362a  -s ours

Change-Id: I31e63888d11657f0ead8732e6af22282d66a23b5

7 years agoImport translations. DO NOT MERGE am: d1b8917270 -s ours am: 6296c78ee4 -s ours
Bill Yi [Thu, 27 Oct 2016 05:22:26 +0000 (05:22 +0000)]
Import translations. DO NOT MERGE am: d1b8917270  -s ours am: 6296c78ee4  -s ours
am: 044be18ae4  -s ours

Change-Id: I20f54a15d996b4fb1c786b1aabe8e090c5a558ca

7 years agoMerge "Import translations. DO NOT MERGE am: 6e3055ee37 -s ours am: 0c78c9e049 ...
Android Build Merger (Role) [Thu, 27 Oct 2016 05:22:18 +0000 (05:22 +0000)]
Merge "Import translations. DO NOT MERGE am: 6e3055ee37  -s ours am: 0c78c9e049  -s ours"

7 years agoImport translations. DO NOT MERGE am: 6e3055ee37 -s ours
Bill Yi [Thu, 27 Oct 2016 05:21:41 +0000 (05:21 +0000)]
Import translations. DO NOT MERGE am: 6e3055ee37  -s ours
am: 0c78c9e049  -s ours

Change-Id: Ide1881569e565b54662c66ee44b90e6d215d5042

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5 -s ours
Bill Yi [Thu, 27 Oct 2016 05:21:38 +0000 (05:21 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 41912188e5  -s ours
am: f0a5ebb129  -s ours

Change-Id: Ia8d103f423f72e3a32005f3f2c424ae2adac0ab3

7 years agoMerge "ConnectivityServiceTest: mark flaky test as such"
Hugo Benichi [Thu, 27 Oct 2016 05:21:30 +0000 (05:21 +0000)]
Merge "ConnectivityServiceTest: mark flaky test as such"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 000e2093d2 -s ours
Bill Yi [Thu, 27 Oct 2016 05:20:49 +0000 (05:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 000e2093d2  -s ours
am: c7b922bb83  -s ours

Change-Id: Ibe53e83a20755f14dc0f79b7aeae3686ab1c343f

7 years agoImport translations. DO NOT MERGE am: bff09ae3c8 -s ours
Bill Yi [Thu, 27 Oct 2016 05:20:47 +0000 (05:20 +0000)]
Import translations. DO NOT MERGE am: bff09ae3c8  -s ours
am: 305004ba4d  -s ours

Change-Id: I43d0bd29cfb6ed5d332ee417c5b4e79d04b9b1b0

7 years agoImport translations. DO NOT MERGE am: fc0224f880 -s ours
Bill Yi [Thu, 27 Oct 2016 05:19:57 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am: fc0224f880  -s ours
am: 5eb8d7f3f3  -s ours

Change-Id: I3435809c9e16599e99d62ec7a40aa16b0254c8d0

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2 -s ours
Bill Yi [Thu, 27 Oct 2016 05:19:56 +0000 (05:19 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: c2effd95e2  -s ours
am: 6b8d9b2337  -s ours

Change-Id: I8311d8bc6ceee0de7935e8aaaa4c7dd091d2662f

7 years agoImport translations. DO NOT MERGE am: c541a19fba -s ours am: 18608133d8 -s ours...
Bill Yi [Thu, 27 Oct 2016 05:19:07 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am: c541a19fba  -s ours am: 18608133d8  -s ours am: 1653bfafc4  -s ours
am: 4cb84a4c59  -s ours

Change-Id: I9c64e2069eff1f3f24bcc5d1d29b5f767ab71e5e

7 years agoImport translations. DO NOT MERGE am: 644a22437f -s ours
Bill Yi [Thu, 27 Oct 2016 05:19:05 +0000 (05:19 +0000)]
Import translations. DO NOT MERGE am: 644a22437f  -s ours
am: 316c6df269  -s ours

Change-Id: Ie9824ce9a2f24cc54b674209c82b717699a3cd2c

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac -s ours
Bill Yi [Thu, 27 Oct 2016 05:13:33 +0000 (05:13 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 43905cc9ac  -s ours
am: 3b2c3fe5ef  -s ours

Change-Id: I4cbde56de0e86e7dc1f97595a60a2d38de078bc7

7 years agoImport translations. DO NOT MERGE am: 1377e2b985 -s ours
Bill Yi [Thu, 27 Oct 2016 05:12:51 +0000 (05:12 +0000)]
Import translations. DO NOT MERGE am: 1377e2b985  -s ours
am: df305805c6  -s ours

Change-Id: Id238b877c3013be65641fe1e1d6937b6c1e4bdbf

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45 -s ours
Bill Yi [Thu, 27 Oct 2016 05:12:04 +0000 (05:12 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: ad45d97c45  -s ours
am: d557ea9388  -s ours

Change-Id: Id6e530980e21ac4d2cb63ca3623bc28457ae8c2d

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
Bill Yi [Thu, 27 Oct 2016 05:11:20 +0000 (05:11 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev
am: d37981be5a  -s ours

Change-Id: I847bb6ba0d87353748f4506502f5d17d0f93d035

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours...
Bill Yi [Thu, 27 Oct 2016 05:11:16 +0000 (05:11 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours
am: 38948cf86d  -s ours

Change-Id: Ie362bb496f0f7262399434248f23bf1bbcbea991

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 50f02f9d0a  -s ours

Change-Id: Ia71f1c93cb5abcc59867fc6318eac41536bf8ea0

7 years agoImport translations. DO NOT MERGE am: d1b8917270 -s ours
Bill Yi [Thu, 27 Oct 2016 05:09:19 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE am: d1b8917270  -s ours
am: 6296c78ee4  -s ours

Change-Id: I9396a152c47e270c7660f46dca006468d26306c6

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:09:14 +0000 (05:09 +0000)]
Import translations. DO NOT MERGE
am: 6e3055ee37  -s ours

Change-Id: Ieb71085d233a47c000241368d435a3f8df985e03

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 27 Oct 2016 05:08:10 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 41912188e5  -s ours

Change-Id: Iadb23aebd270d96d6597e654b6ba5f417b023e96

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:08:08 +0000 (05:08 +0000)]
Import translations. DO NOT MERGE
am: bff09ae3c8  -s ours

Change-Id: Ie89040ae5c700d5ee12f371ff5aa412b7fec0340

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 05:08:01 +0000 (05:08 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 000e2093d2  -s ours

Change-Id: I9dc4dc4f9af82ecb8cd20acd3eb13021d25375dd

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:07:56 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE
am: fc0224f880  -s ours

Change-Id: Ia6ca469ec75244202c5cf49605e05ab364bd0274

7 years agoImport translations. DO NOT MERGE am: c541a19fba -s ours am: 18608133d8 -s ours
Bill Yi [Thu, 27 Oct 2016 05:07:03 +0000 (05:07 +0000)]
Import translations. DO NOT MERGE am: c541a19fba  -s ours am: 18608133d8  -s ours
am: 1653bfafc4  -s ours

Change-Id: I4793a3d04fc08897fdab2f11f4fa194076219b49

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
Bill Yi [Thu, 27 Oct 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: c2effd95e2  -s ours

Change-Id: I982ed94bacbe316d1633fa30bb8b6b315ebf2354

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:06:59 +0000 (05:06 +0000)]
Import translations. DO NOT MERGE
am: 644a22437f  -s ours

Change-Id: I8204369580e5bb38a72570b175c066e903c2e9a9

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 27 Oct 2016 05:04:27 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 43905cc9ac  -s ours

Change-Id: Ic4ffe5558fbb0baa525e76dbb14031c4d0cedde4

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:04:25 +0000 (05:04 +0000)]
Import translations. DO NOT MERGE
am: 1377e2b985  -s ours

Change-Id: I33398bdb4166839276e72271097684fcd9e02655

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a2b301d0e1 -s ours
Bill Yi [Thu, 27 Oct 2016 05:04:11 +0000 (05:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: a2b301d0e1  -s ours
am: 68d6955b45  -s ours

Change-Id: I2b21eda80569335e44cf39c087e6dc4590d69d69

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 27 Oct 2016 05:03:08 +0000 (05:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: ad45d97c45  -s ours

Change-Id: I3364c6eccecc274568d48f207c59be97ae78b1ce

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE
am: d1b8917270  -s ours

Change-Id: I6cf22433138b147581a2c055160e2610e0cfc2ce

7 years agoImport translations. DO NOT MERGE am: aad661f874 -s ours
Bill Yi [Thu, 27 Oct 2016 05:03:06 +0000 (05:03 +0000)]
Import translations. DO NOT MERGE am: aad661f874  -s ours
am: f21106b0e8  -s ours

Change-Id: I8b4225b3c88971f17fa97c9bedb0481f78260c23

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:01:32 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:01:03 +0000 (05:01 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f...
Android Build Merger (Role) [Thu, 27 Oct 2016 05:00:34 +0000 (05:00 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours am: b9cc1f603c  -s ours" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 05:00:15 +0000 (05:00 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:59:53 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f -s ours
Bill Yi [Thu, 27 Oct 2016 04:59:49 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 696b0e4d9f  -s ours
am: b9cc1f603c  -s ours

Change-Id: I76607e7e8ecbdf03db23955402a626d89f144e31

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:59:28 +0000 (04:59 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:58:59 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoImport translations. DO NOT MERGE am: c541a19fba -s ours
Bill Yi [Thu, 27 Oct 2016 04:59:00 +0000 (04:59 +0000)]
Import translations. DO NOT MERGE am: c541a19fba  -s ours
am: 18608133d8  -s ours

Change-Id: I56489534a775a003ca0e5863bedafe2201e38c28

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:58:33 +0000 (04:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:57:42 +0000 (04:57 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:56:58 +0000 (04:56 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
Bill Yi [Thu, 27 Oct 2016 04:54:38 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: a2b301d0e1  -s ours

Change-Id: I33dcb6841acdee235a66dcf4f0900ee6cc041090

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 04:54:34 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am: aad661f874  -s ours

Change-Id: I8196b80e5f5ce6ac932e7556fc4727ee4047c6ba

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 27 Oct 2016 04:54:33 +0000 (04:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 696b0e4d9f  -s ours

Change-Id: I807ae6a4f2808825e8363104e8e8661d5de77a2b

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 04:54:31 +0000 (04:54 +0000)]
Import translations. DO NOT MERGE
am: c541a19fba  -s ours

Change-Id: I8540ec656b922d2a56b8ddcb58c719e52a1bb5c6

7 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 27 Oct 2016 04:50:39 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE"

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr2-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:50:09 +0000 (04:50 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 27 Oct 2016 04:44:58 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "AAPT2: Rename to match new style"
TreeHugger Robot [Thu, 27 Oct 2016 04:31:02 +0000 (04:31 +0000)]
Merge "AAPT2: Rename to match new style"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 03:18:34 +0000 (20:18 -0700)]
Import translations. DO NOT MERGE

Change-Id: I01dfed1e6db0d4fe5cff72df3cec234400085fde
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 03:12:01 +0000 (20:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I637b457c6e9a20345cd5dbe599c4dce15ca9040c
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 27 Oct 2016 02:59:45 +0000 (19:59 -0700)]
Import translations. DO NOT MERGE

Change-Id: I0f32e71b1e47beacb5e11d77bb7939fd2b2f5eb7
Auto-generated-cl: translation import

7 years agoMerge "resolve merge conflicts of 1238daf to master"
TreeHugger Robot [Thu, 27 Oct 2016 02:50:23 +0000 (02:50 +0000)]
Merge "resolve merge conflicts of 1238daf to master"

7 years agoMerge "Adding option to swipe to dismiss."
TreeHugger Robot [Thu, 27 Oct 2016 02:48:07 +0000 (02:48 +0000)]
Merge "Adding option to swipe to dismiss."

7 years agoAAPT2: Rename to match new style
Adam Lesinski [Sat, 22 Oct 2016 00:56:45 +0000 (17:56 -0700)]
AAPT2: Rename to match new style

Use Google3 naming style to match new
projects' and open source google projects' style.

Preferred to do this in a massive CL so as to avoid
style inconsistencies that plague legacy code bases.
This is a relatively NEW code base, may as well keep
it up to date.

Test: name/style refactor - existing tests pass
Change-Id: Ie80ecb78d46ec53efdfca2336bb57d96cbb7fb87

7 years agoMerge "Removed temporary workaround for multi-window assist crash."
TreeHugger Robot [Thu, 27 Oct 2016 02:09:45 +0000 (02:09 +0000)]
Merge "Removed temporary workaround for multi-window assist crash."

7 years agoMerge "Remove unneeded libraries from libmedia_jni"
TreeHugger Robot [Thu, 27 Oct 2016 01:01:12 +0000 (01:01 +0000)]
Merge "Remove unneeded libraries from libmedia_jni"

7 years agoresolve merge conflicts of 1238daf to master
Marie Janssen [Thu, 27 Oct 2016 00:57:22 +0000 (17:57 -0700)]
resolve merge conflicts of 1238daf to master

Change-Id: Icc70d291379d4f4816881e46704197513e6d548e

7 years agoMerge "Remove no longer used FLAG_ARCHIVE."
Tomasz Mikolajewski [Thu, 27 Oct 2016 00:56:28 +0000 (00:56 +0000)]
Merge "Remove no longer used FLAG_ARCHIVE."

7 years agoConnectivityServiceTest: mark flaky test as such
Hugo Benichi [Mon, 17 Oct 2016 06:54:51 +0000 (15:54 +0900)]
ConnectivityServiceTest: mark flaky test as such

This patch extracts into its own independent test a test sub-block looking
for a race condition when not waiting on handlers to become idle:
there is no way to prevent the race from not happening when looking for
it this way. This makes the test flakky.

This new independent test is tagged with @FlakkyTest(tolerance = 3).

Test: ConnectivityServiceTest passes, with higher probability.
Bug: 31479480
Change-Id: Ic0e2ffbe669f2ea8cc62e8a0d4763703368db019

7 years agoBluetooth: prevent enabling BLE in airplane mode am: a80d745c65 am: 6affbde556
Marie Janssen [Thu, 27 Oct 2016 00:29:51 +0000 (00:29 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65 am: 6affbde556
am: 73bfd25356

Change-Id: Ieb424a2d68058d4171e6c9bd04f8a42cc1f3d7e9

7 years agoBluetooth: prevent enabling BLE in airplane mode am: a80d745c65
Marie Janssen [Thu, 27 Oct 2016 00:24:48 +0000 (00:24 +0000)]
Bluetooth: prevent enabling BLE in airplane mode am: a80d745c65
am: 6affbde556

Change-Id: I4b67a584fc9db12431d4552387abe9c456dee4d2

7 years agoBluetooth: prevent enabling BLE in airplane mode
Marie Janssen [Thu, 27 Oct 2016 00:20:17 +0000 (00:20 +0000)]
Bluetooth: prevent enabling BLE in airplane mode
am: a80d745c65

Change-Id: I05a57fa747abedab24e0509c1fb7ab8737b2256a

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Oct 2016 23:50:38 +0000 (16:50 -0700)]
Import translations. DO NOT MERGE

Change-Id: I6bbb28b633130252b0dd3f6036cf4e8812814ce7
Auto-generated-cl: translation import

7 years agoMerge "No recents items can be dismissed by tap or swipe"
TreeHugger Robot [Wed, 26 Oct 2016 23:45:19 +0000 (23:45 +0000)]
Merge "No recents items can be dismissed by tap or swipe"

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Oct 2016 23:42:29 +0000 (16:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie1a7cb9598cadefe20558f959a3bdfa1589e7652
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Oct 2016 23:33:47 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia2d8f54a16000eea7175a78c25eb06cec1ad3dd4
Auto-generated-cl: translation import

7 years agoRefactor stack removal methods
Andrii Kulian [Wed, 26 Oct 2016 23:15:25 +0000 (16:15 -0700)]
Refactor stack removal methods

Refactor some parts of stack removal to make methods implementations
correspond to their names.

Change-Id: Ie686c463d67232d9d5fd96468fe3911003d22471
Test: Manual and existing tests still pass.

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Oct 2016 23:21:49 +0000 (16:21 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia5f9329d6be981207e939150ed924eaac5bd2180
Auto-generated-cl: translation import

7 years agoImport translations. DO NOT MERGE
Bill Yi [Wed, 26 Oct 2016 23:07:06 +0000 (16:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id8fd7be4130e852b023392635da7fecc39ebfd74
Auto-generated-cl: translation import