git.osdn.net Git - android-x86/frameworks-base.git/log

Adam Lesinski [Mon, 7 Aug 2017 18:07:36 +0000 (18:07 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am: 242c22c900 am: 62e72c21f5
am: 2e60ba0a03

Change-Id: Idd3e202a71be7e19aed1d2428e9a2efa6eb5abab

commit | commitdiff | tree

Adam Lesinski [Mon, 7 Aug 2017 18:03:19 +0000 (18:03 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am: 242c22c900 am: dc901a6318
am: 36aa7b6156

Change-Id: Ifb3ee9eb8a98c2aaac09525b1bc55e01a286e0fc

commit | commitdiff | tree

Adam Lesinski [Mon, 7 Aug 2017 17:58:43 +0000 (17:58 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am: 242c22c900
am: 62e72c21f5

Change-Id: I911580693ea5fcba1581726a837bbad5104402bf

commit | commitdiff | tree

Colin Cross [Mon, 7 Aug 2017 17:55:23 +0000 (17:55 +0000)]

Merge "Use class retention for VisibleForTesting annotations"

commit | commitdiff | tree

Adam Lesinski [Mon, 7 Aug 2017 17:51:36 +0000 (17:51 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev am: 242c22c900
am: dc901a6318

Change-Id: Ic9ff5a40d228396734b314f8e6bd68d7152986cd

commit | commitdiff | tree

Adam Lesinski [Mon, 7 Aug 2017 17:43:08 +0000 (17:43 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am: 242c22c900

Change-Id: I8be36dcf67b6d32f69fbefdf2bd78e04034f6bb8

commit | commitdiff | tree

Adam Lesinski [Mon, 7 Aug 2017 17:43:05 +0000 (17:43 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev
am: 242c22c900

Change-Id: I8fa65b89f1f10fe8920aa45d14c7b917b6bc74d8

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 17:34:44 +0000 (17:34 +0000)]

Merge "AAPT2: Disable locale domination for deduping" into oc-dr1-dev

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:32:55 +0000 (17:32 +0000)]

Merge "Location: adding NULL check for the LPP_PROFILE property am: 8eec744ccb am: fe7865b10d" into oc-mr1-dev-plus-aosp
am: 76f8762220

Change-Id: Ib5bb9f59d79a6f7d13798f39aeaff7a60916c5a8

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:31:02 +0000 (17:31 +0000)]

Location: adding NULL check for the LPP_PROFILE property am: 8eec744ccb am: 13fac42125
am: ecc493dbfe

Change-Id: Ief3b299ea0384b5ced134f0045857b25ddf21df9

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 17:27:18 +0000 (17:27 +0000)]

Merge "Location: adding NULL check for the LPP_PROFILE property am: 8eec744ccb am: fe7865b10d" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:24:35 +0000 (17:24 +0000)]

Location: adding NULL check for the LPP_PROFILE property am: 8eec744ccb
am: fe7865b10d

Change-Id: I6e919aba831bdd4d42aee2510ab4118cb7c98a3e

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:24:28 +0000 (17:24 +0000)]

Location: adding NULL check for the LPP_PROFILE property am: 8eec744ccb
am: 13fac42125

Change-Id: I16cdfb5701b49eba76b8866e872301bce387de4c

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:18:58 +0000 (17:18 +0000)]

Location: adding NULL check for the LPP_PROFILE property
am: 8eec744ccb

Change-Id: Ic8b63fd181eeaa2272113fdd5fb70c4dbee46357

commit | commitdiff | tree

Ecco Park [Mon, 7 Aug 2017 17:18:55 +0000 (17:18 +0000)]

Location: adding NULL check for the LPP_PROFILE property
am: 8eec744ccb

Change-Id: Ia72f80b5d809190c7e2f733c8e59bf989f826973

commit | commitdiff | tree

Ecco Park [Fri, 4 Aug 2017 23:21:59 +0000 (16:21 -0700)]

Location: adding NULL check for the LPP_PROFILE property

Bug: 35485906

Change-Id: I5e40be8ce0d3832f0e913bfe8fd9a38d87d0d28c
Signed-off-by: Ecco Park <eccopark@google.com>

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:50:38 +0000 (16:50 +0000)]

Merge "Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62 am: c75e254eb4" into oc-mr1-dev-plus-aosp
am: 788290f049 -s ours

Change-Id: I6fee6f98e67f86f61be245131413e636e2e94a1a

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:46:38 +0000 (16:46 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62 am: c75e254eb4
am: 85e932ebf6 -s ours

Change-Id: I7041080b22fe626f4942a2b4b5c9e599a8db99f3

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:38:45 +0000 (16:38 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62 am: b901f055b5
am: 47a639b4e6 -s ours

Change-Id: I3c8d0aa0b96f413962862f2946c7df404d07ff66

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 16:36:19 +0000 (16:36 +0000)]

Merge "Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62 am: c75e254eb4" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:34:12 +0000 (16:34 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62
am: c75e254eb4

Change-Id: Ifcec2cc0c56eeb8e838f0b25ccd510759cdfa85b

commit | commitdiff | tree

Tor Norbye [Mon, 7 Aug 2017 16:32:52 +0000 (16:32 +0000)]

Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev am: 708d118458
am: dc2072c2a4

Change-Id: I5aa876a8a13edc40fbf6de71e4bc04ceaf0002f0

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:30:38 +0000 (16:30 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev am: 35a563ef62
am: b901f055b5

Change-Id: I8ebdd09774cf7f04ee8abe09c4efe9fefef047cb

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:26:06 +0000 (16:26 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: I1c2b048dd8375ca7e6afca552241c5bbbfc41021

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:24:31 +0000 (16:24 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev
am: 35a563ef62

Change-Id: Ib898af17ce2985a1e19759dd9296f3cea8077018

commit | commitdiff | tree

Tor Norbye [Mon, 7 Aug 2017 16:24:25 +0000 (16:24 +0000)]

Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev
am: 708d118458

Change-Id: Ide1c1c97ce9388121e3b56b7773194c39a40bc22

commit | commitdiff | tree

Jonathan Basseri [Mon, 7 Aug 2017 16:18:52 +0000 (16:18 +0000)]

Merge "Move getNetworkCountryIso impl from TM to PIM." into oc-dr1-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 16:18:37 +0000 (16:18 +0000)]

Merge "Allow marking fields with @TargetApi(XX)" into oc-mr1-dev

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 15:02:53 +0000 (15:02 +0000)]

Merge "Fix monkey bug when focus change before layout"

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 14:43:06 +0000 (14:43 +0000)]

Merge "Use colorFilters when rendering to an sRGB bitmap."

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 14:05:18 +0000 (14:05 +0000)]

Merge "Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee am: 27106b97b3" into oc-mr1-dev-plus-aosp
am: da340cf040

Change-Id: Id2941edf0fb1f5fbcd610e44d99191ef8d55545d

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 14:03:22 +0000 (14:03 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee am: 0870da759f
am: 0fabec8051

Change-Id: I4b47e1cf3ccad23702b952beb35b085292b27f6d

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 13:57:39 +0000 (13:57 +0000)]

Merge "Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee am: 27106b97b3" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:54:31 +0000 (13:54 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee
am: 0870da759f

Change-Id: Iffbd44676b0c4157b040b215d35a5359c6acc509

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:54:24 +0000 (13:54 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev am: 9f3bac52ee
am: 27106b97b3

Change-Id: I6b68fa4875a9eddc3071c4f0199c1d1f085546aa

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:48:49 +0000 (13:48 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
am: 9f3bac52ee

Change-Id: I111fe0d4adffd228f4afd8daa79a706d17c328ec

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:48:46 +0000 (13:48 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev
am: 9f3bac52ee

Change-Id: I8c17429ce2b79a3e14e7b6cbabf7b377ace44718

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 13:41:22 +0000 (13:41 +0000)]

Merge "AOD: Fix launching notifications from occluded AOD" into oc-dr1-dev

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:15:12 +0000 (13:15 +0000)]

Merge "Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c am: 7a1bc55d78" into oc-mr1-dev-plus-aosp
am: e558f21f30

Change-Id: I1fa5ffc1cd43ca6ee35b2098f29531f3a9565f2f

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:13:19 +0000 (13:13 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c am: e2f42b1c19
am: 6142b9b1a5

Change-Id: I4942226389cfb629ab2364c53f4adaaa830fc9ff

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 13:09:26 +0000 (13:09 +0000)]

Merge "Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c am: 7a1bc55d78" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:08:05 +0000 (13:08 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c
am: 7a1bc55d78

Change-Id: Iad3fa37a7020319005b13566c71e55824fb31c07

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:07:43 +0000 (13:07 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev am: 81e3b48f9c
am: e2f42b1c19

Change-Id: I942c8a5d429b678b4880fd03a464f57c2b963a09

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:02:21 +0000 (13:02 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am: 81e3b48f9c

Change-Id: I6f0ae86412eb174474d640c437e0b0b006507c00

commit | commitdiff | tree

Adrian Roos [Mon, 7 Aug 2017 13:02:18 +0000 (13:02 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev
am: 81e3b48f9c

Change-Id: I21064a3c20f440fb0cf244cd4ab981761573ec43

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 12:53:50 +0000 (12:53 +0000)]

Merge "AOD: Never show bouncer when dozing" into oc-dr1-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:52:25 +0000 (12:52 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev am: 9aa43e6320 am: a4988d0977
am: 6749238ce6

Change-Id: Ieeb6783f450bbc78bd2879556fdf71a836cf530d

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:50:38 +0000 (12:50 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev am: 9aa43e6320 am: 8f6b045525
am: 94936e4272

Change-Id: I7b54b9e5ef0a6ba5464d24bc9f17f0c29d297fb4

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:45:17 +0000 (12:45 +0000)]

Merge "Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa am: 31f5af501f" into oc-mr1-dev-plus-aosp
am: cfd109f841

Change-Id: I24294560f06be4b5fd8362c18211a1591cee134a

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:43:24 +0000 (12:43 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa am: a4ddbf3aea
am: 2d290d8cf2

Change-Id: I75bba81e56e82c0cea48a3878d4bcd24e74f4b9e

commit | commitdiff | tree

Derek Sollenberger [Fri, 4 Aug 2017 12:35:10 +0000 (08:35 -0400)]

Use colorFilters when rendering to an sRGB bitmap.

Bug: 62347704
Test: CtsUiRenderingTestCases, CtsGraphicsTestCases, hwui_unit_tests
Change-Id: I3e237b64cd92217b02d4995bdd695a28d3f393ee

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:43:21 +0000 (12:43 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev am: 9aa43e6320
am: a4988d0977

Change-Id: I1cd48f2d91c3eb9052ddf70ad2e75d562a332a62

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:39:42 +0000 (12:39 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev am: 9aa43e6320
am: 8f6b045525

Change-Id: I16c1990b1763a4663d4e483446fb7c7eb2b17320

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 12:37:15 +0000 (12:37 +0000)]

Merge "Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa am: 31f5af501f" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:35:53 +0000 (12:35 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa
am: 31f5af501f

Change-Id: I2a6c5b0cf508d1e4c9d9f631d8936f0a31db12f8

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:34:41 +0000 (12:34 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am: 9aa43e6320

Change-Id: I0889a00cbdc54d401484391d66e0dd06ac92fd71

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:34:36 +0000 (12:34 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev am: 997f2f71fa
am: a4ddbf3aea

Change-Id: Ic0d7834bdf2518cd47b7b46367b575dee9347646

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:32:13 +0000 (12:32 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev
am: 9aa43e6320

Change-Id: I28694bee5e1768ba51a8d60290587c6d56e930df

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:27:54 +0000 (12:27 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev
am: 997f2f71fa

Change-Id: Ic6b622398c1426be3b48096ec6a041ee6c38fd0d

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:27:53 +0000 (12:27 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev
am: 997f2f71fa

Change-Id: I8b5fb57655afe1b9cab6afe3f5f34d48413af062

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:23:55 +0000 (12:23 +0000)]

Merge "Defer updating dim layers if layout is deferred" into oc-dr1-dev

commit | commitdiff | tree

Jorim Jaggi [Mon, 7 Aug 2017 12:17:35 +0000 (12:17 +0000)]

Merge "Fix light bar flickers" into oc-dr1-dev

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:17:51 +0000 (11:17 +0000)]

Merge "Merge "screencap: always exit with _exit()." into oc-dr1-dev am: 4499576db0 -s ours am: 7075b75893 -s ours" into oc-mr1-dev-plus-aosp
am: ef01ff35b3 -s ours

Change-Id: If2f63eee2deeb9f536e42ca7dde9e24b59458dbb

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:16:10 +0000 (11:16 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev am: 4499576db0 am: 6513db5b49 -s ours
am: ad951b7285 -s ours

Change-Id: If8dc2a5de46672005795f1d77100de737aef0102

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 11:12:01 +0000 (11:12 +0000)]

Merge "Merge "screencap: always exit with _exit()." into oc-dr1-dev am: 4499576db0 -s ours am: 7075b75893 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:08:38 +0000 (11:08 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev am: 4499576db0
am: 6513db5b49 -s ours

Change-Id: I226b437f808192a5d6fbe30a859c9dc5bec47220

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:08:37 +0000 (11:08 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev am: 4499576db0 -s ours
am: 7075b75893 -s ours

Change-Id: Ibd3b94164408b01dab74f3e0c86b4db5f819c735

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 11:03:44 +0000 (11:03 +0000)]

Merge "Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257 am: 083a84c6ae" into oc-mr1-dev-plus-aosp
am: ba41d4733f

Change-Id: Ibb7049dac6936320abfede0bd4dc1f0b2b10ba9b

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:01:15 +0000 (11:01 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev
am: 4499576db0

Change-Id: I5b48a5792994034e93f7ed7d5024e44fb452e994

commit | commitdiff | tree

Martijn Coenen [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev
am: 4499576db0 -s ours

Change-Id: I6119b3e45a4b104aa9a7cbad576a6b3d8a273ca4

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 11:01:14 +0000 (11:01 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257 am: 2c3fecd4de
am: 40d1a867a9

Change-Id: Iae66eaf0da7292181226208585fe6fb2e529ff4f

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 10:57:13 +0000 (10:57 +0000)]

Merge "Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257 am: 083a84c6ae" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 10:55:03 +0000 (10:55 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257
am: 2c3fecd4de

Change-Id: I97d216587f3ba0225164e4c9457bddcde0e884ee

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 10:54:59 +0000 (10:54 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev am: 17844f2257
am: 083a84c6ae

Change-Id: I1a00df4be76dbf998eda020ad59c5ce38096857d

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 10:54:02 +0000 (10:54 +0000)]

Merge "screencap: always exit with _exit()." into oc-dr1-dev

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 10:49:08 +0000 (10:49 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am: 17844f2257

Change-Id: I0ed4eb1635d525d3e82bab7b26171cd0b40a37a6

commit | commitdiff | tree

Robert Carr [Mon, 7 Aug 2017 10:49:05 +0000 (10:49 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev
am: 17844f2257

Change-Id: Ic1d7779f66958961da22230187f71310d9fedec8

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 10:44:18 +0000 (10:44 +0000)]

Merge "Avoid entering orientation changing state when seamlessly rotating." into oc-dr1-dev

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:20:02 +0000 (06:20 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c5622b88bd -s ours" into oc-mr1-dev-plus-aosp
am: 731b2aa241 -s ours

Change-Id: Ib1c76f44a7c28c888adc42a7ffec896ca0299d42

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 06:17:55 +0000 (06:17 +0000)]

Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 -s ours" into oc-dr1-dev-plus-aosp am: 8047f7acad -s ours
am: 8f79258c5c -s ours

Change-Id: I2f269ae7987f50dc61f4d29c802c3923d74183be

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:10:59 +0000 (06:10 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4e9a4d81d2 -s ours am: 9faa483116 -s ours am: cf6f44fe62 -s ours
am: 7495692235 -s ours

Change-Id: Ia2228e206f1801f15f415ce19edd84f99bd9a741

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 06:09:53 +0000 (06:09 +0000)]

Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: c5622b88bd -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 06:08:53 +0000 (06:08 +0000)]

Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 am: 85808c8293 -s ours" into oc-mr1-dev-plus-aosp
am: e3e371fe1d -s ours

Change-Id: I08c8f8be01dbc136a344a1813758be31d21fec07

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:07:19 +0000 (06:07 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c5622b88bd -s ours

Change-Id: I6c27d084089824f6c405af45e0d22725ca8d84b1

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 06:07:13 +0000 (06:07 +0000)]

Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 -s ours" into oc-dr1-dev-plus-aosp
am: 8047f7acad -s ours

Change-Id: I5d3fe083ccbec5baa7f53beca4cb938312877a9e

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:04:15 +0000 (06:04 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c733eac940 -s ours am: 5c0301ef95 -s ours am: 7fec3b9e05 -s ours
am: 20096d1b22 -s ours

Change-Id: I042a32adf84282ad8b921fbf0aa02948a3fac018

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:02:18 +0000 (06:02 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4e9a4d81d2 -s ours am: 9faa483116 -s ours
am: cf6f44fe62 -s ours

Change-Id: I7e1f61c63e16e64d6d2fa146a843d1d0e1b78034

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:01:53 +0000 (06:01 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 06a47f450a -s ours am: 2c97d049c2 -s ours am: afc72a639b -s ours
am: ecbd8290f6 -s ours

Change-Id: I14ba7a348304d536808b6ca956e8da24e924d982

commit | commitdiff | tree

TreeHugger Robot [Mon, 7 Aug 2017 06:01:02 +0000 (06:01 +0000)]

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 06:00:04 +0000 (06:00 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: e4f2ebbd25 -s ours am: bbf4ba81ac -s ours am: 648a3e4165 -s ours
am: bdb21135a0 -s ours

Change-Id: I42fdb9f3aa126fcb0456117e7a88c1354a2e191c

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 05:59:44 +0000 (05:59 +0000)]

Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 am: 85808c8293 -s ours" into oc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 05:57:27 +0000 (05:57 +0000)]

Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965
am: 85808c8293 -s ours

Change-Id: I082ad1d8426245e26a1301c9b82d7e62cd3e4b33

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:55:34 +0000 (05:55 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: c733eac940 -s ours am: 5c0301ef95 -s ours
am: 7fec3b9e05 -s ours

Change-Id: Iba049b7e7ec09c63a8f3fbfcb6fd1f5460accba1

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:53:35 +0000 (05:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 1d14f1ada0 -s ours am: fdcf523f18 -s ours am: 4b999d3f87 -s ours
am: 44561a7c6b -s ours

Change-Id: I62f215082994265430a0dc346dc56b133015b0df

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:53:32 +0000 (05:53 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 06a47f450a -s ours am: 2c97d049c2 -s ours
am: afc72a639b -s ours

Change-Id: Ifcd115a90c7b97750712d1ca4a7b2d98e9d96872

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:51:39 +0000 (05:51 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 73dfb82d48 -s ours am: 8ca1114359 -s ours am: 5594619b6c -s ours
am: 07787325ed -s ours

Change-Id: I423926970b0775d1959bfcdf59d14bafff106760

commit | commitdiff | tree

Android Build Merger (Role) [Mon, 7 Aug 2017 05:50:51 +0000 (05:50 +0000)]

Merge "Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev am: 1b3877a965 -s ours" into oc-dr1-dev-plus-aosp

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 05:49:25 +0000 (05:49 +0000)]

Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965

Change-Id: I50748aa0c9332787797f91265afccf82ceabf332

commit | commitdiff | tree

Hugo Benichi [Mon, 7 Aug 2017 05:49:17 +0000 (05:49 +0000)]

Merge "NetworkCapabilities: fix describeImmutableDifferences" into oc-dr1-dev
am: 1b3877a965 -s ours

Change-Id: I42723162b29e8a8c966201e1b4da811e2d266f00

commit | commitdiff | tree

Bill Yi [Mon, 7 Aug 2017 05:48:21 +0000 (05:48 +0000)]

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: 4e9a4d81d2 -s ours
am: 9faa483116 -s ours

Change-Id: Ia597a61df6d1909afd026b26cc3fc5df26db6ed2