OSDN Git Service

android-x86/frameworks-base.git
6 years agoMerge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f am: 01014743c0
Charles He [Tue, 19 Sep 2017 08:25:22 +0000 (08:25 +0000)]
Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f am: 01014743c0
am: 551fb6ba84

Change-Id: Id3ac9d9e2a982e9205f4f4a70c1373eed6480844

6 years agoMerge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f
Charles He [Tue, 19 Sep 2017 08:17:12 +0000 (08:17 +0000)]
Merge changes from topic "always-on-vpn" am: cc15c7f8c1 am: 692b55390f
am: 01014743c0

Change-Id: Ide329f8e32538f4643e727697b35bfc2b7007f57

6 years agoMerge "Translate Android log entries to stats_log proto Test: tested on local device"
TreeHugger Robot [Tue, 19 Sep 2017 08:14:55 +0000 (08:14 +0000)]
Merge "Translate Android log entries to stats_log proto Test: tested on local device"

6 years agoMerge changes from topic "always-on-vpn" am: cc15c7f8c1
Charles He [Tue, 19 Sep 2017 08:09:41 +0000 (08:09 +0000)]
Merge changes from topic "always-on-vpn" am: cc15c7f8c1
am: 692b55390f

Change-Id: I3931c053c4daff092b06e3e1d673817708762a62

6 years agoMerge changes from topic "always-on-vpn"
Charles He [Tue, 19 Sep 2017 08:01:45 +0000 (08:01 +0000)]
Merge changes from topic "always-on-vpn"
am: cc15c7f8c1

Change-Id: I7391ce7ecab4f8e73912f420d49150ed7210ea6c

6 years agoMerge changes from topic "always-on-vpn"
Charles He [Tue, 19 Sep 2017 07:50:13 +0000 (07:50 +0000)]
Merge changes from topic "always-on-vpn"

* changes:
  Opt-out for always-on VPN: rename API.
  Opt-out for always-on VPN

6 years agoMerge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab am: a35bbadeba...
Hugo Benichi [Tue, 19 Sep 2017 07:42:18 +0000 (07:42 +0000)]
Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab am: a35bbadeba am: 19625788a1
am: 98177f01f7

Change-Id: I7d57c0f2377f44bcf75e18c80c0306bbfccb9591

6 years agoMerge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab am: a35bbadeba
Hugo Benichi [Tue, 19 Sep 2017 07:36:12 +0000 (07:36 +0000)]
Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab am: a35bbadeba
am: 19625788a1

Change-Id: I8ca2a01a95acaaca2599563efd6a21e4372d1f95

6 years agoMerge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab
Hugo Benichi [Tue, 19 Sep 2017 07:29:09 +0000 (07:29 +0000)]
Merge "Wakeup packet events: addressing a few comments" am: 67d16ec1ab
am: a35bbadeba

Change-Id: I33eeb421cff21efdaa409d27fb130ff4754ac6b0

6 years agoMerge "Wakeup packet events: addressing a few comments"
Hugo Benichi [Tue, 19 Sep 2017 07:21:12 +0000 (07:21 +0000)]
Merge "Wakeup packet events: addressing a few comments"
am: 67d16ec1ab

Change-Id: I67b2e54d45a39005e2091a46e8b90d8cc75fe079

6 years agoMerge "Wakeup packet events: addressing a few comments"
Hugo Benichi [Tue, 19 Sep 2017 07:12:03 +0000 (07:12 +0000)]
Merge "Wakeup packet events: addressing a few comments"

6 years agoMerge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2 am: 082234f4aa am...
Rubin Xu [Tue, 19 Sep 2017 06:57:14 +0000 (06:57 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2 am: 082234f4aa am: 3db86833e6
am: 1aabcf76ef

Change-Id: Ie928474dc005c713063885d156786106ca2c281c

6 years agoMerge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2 am: 082234f4aa
Rubin Xu [Tue, 19 Sep 2017 06:51:07 +0000 (06:51 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2 am: 082234f4aa
am: 3db86833e6

Change-Id: I72b0ca1b9b50dacb7067eb6ca12ca48a072b5d26

6 years agoMerge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2
Rubin Xu [Tue, 19 Sep 2017 06:45:04 +0000 (06:45 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult" am: 430d8472b2
am: 082234f4aa

Change-Id: Iedfbc9a6505611d1a30c348ab15f4fb5b62238eb

6 years agoMerge "Fix LinkPropertiesTest.testCompareResult"
Rubin Xu [Tue, 19 Sep 2017 06:37:40 +0000 (06:37 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"
am: 430d8472b2

Change-Id: If87f8c43371ee1f5e2e893232c9e340a1a7339f4

6 years agoTranslate Android log entries to stats_log proto
yro [Fri, 15 Sep 2017 17:06:40 +0000 (10:06 -0700)]
Translate Android log entries to stats_log proto
Test: tested on local device

Change-Id: If9a779a96d31cefaffb1e4424629c14b08e1fc57

6 years agoMerge "Fix LinkPropertiesTest.testCompareResult"
Treehugger Robot [Tue, 19 Sep 2017 06:28:21 +0000 (06:28 +0000)]
Merge "Fix LinkPropertiesTest.testCompareResult"

6 years agoMerge "Destroy vold socket interface completely."
Jeff Sharkey [Tue, 19 Sep 2017 05:11:14 +0000 (05:11 +0000)]
Merge "Destroy vold socket interface completely."

6 years agoWakeup packet events: addressing a few comments
Hugo Benichi [Tue, 19 Sep 2017 04:15:26 +0000 (13:15 +0900)]
Wakeup packet events: addressing a few comments

This patch addresses a few post-submit comment for
commits f562ac34a51dc and 60c9f63b66921.

Bug: 34901696
Bug: 62179647
Test: runtest frameworks-net
Change-Id: I4abec57e0c6bc869dc57b5eb54582dd977b64c30

6 years agoMerge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0 am:...
Steven Moreland [Tue, 19 Sep 2017 03:40:31 +0000 (03:40 +0000)]
Merge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0 am: 0fcb7719e0
am: 2aea4cae01

Change-Id: I2eb8b57458721a1b78766552cb5a12c284b291e7

6 years agoMerge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0
Steven Moreland [Tue, 19 Sep 2017 03:35:00 +0000 (03:35 +0000)]
Merge "Remove unused variable from screencap." am: 376234fc74 am: 32bdb1e9b0
am: 0fcb7719e0

Change-Id: I6aebd6df0bf9734e1567db31d31bfe85609cbb48

6 years agoMerge "Set use low res snapshots for low ram devices missing in theme snapshot" into...
Matthew Ng [Tue, 19 Sep 2017 03:32:47 +0000 (03:32 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev am: 745388d5aa
am: 5b3e2174b2

Change-Id: I82b83dbc1846eb2a53a14b8d6fd4822d4496c02c

6 years agoMerge "Remove unused variable from screencap." am: 376234fc74
Steven Moreland [Tue, 19 Sep 2017 03:29:20 +0000 (03:29 +0000)]
Merge "Remove unused variable from screencap." am: 376234fc74
am: 32bdb1e9b0

Change-Id: If4c2b39333270982975feb1745b3bbaaa3a177b8

6 years agoMerge "Set use low res snapshots for low ram devices missing in theme snapshot" into...
Matthew Ng [Tue, 19 Sep 2017 03:24:28 +0000 (03:24 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev
am: 745388d5aa

Change-Id: I3ced2443d28b3e62c29fdb509d582db7b52c5da8

6 years agoMerge "Remove unused variable from screencap."
Steven Moreland [Tue, 19 Sep 2017 03:22:42 +0000 (03:22 +0000)]
Merge "Remove unused variable from screencap."
am: 376234fc74

Change-Id: I5afb38c24ab6924925ab2852c5fe0ef29a91a2ff

6 years agoMerge "Set use low res snapshots for low ram devices missing in theme snapshot" into...
TreeHugger Robot [Tue, 19 Sep 2017 03:15:41 +0000 (03:15 +0000)]
Merge "Set use low res snapshots for low ram devices missing in theme snapshot" into oc-mr1-dev

6 years agoMerge "Remove unused variable from screencap."
Treehugger Robot [Tue, 19 Sep 2017 03:12:18 +0000 (03:12 +0000)]
Merge "Remove unused variable from screencap."

6 years agoMerge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89...
Pengquan Meng [Tue, 19 Sep 2017 01:44:24 +0000 (01:44 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac am: b3bc234dfa
am: f05a01caf3

Change-Id: I817598283a95460cebd6890ddcc44950d630d7c0

6 years agoMerge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89...
Pengquan Meng [Tue, 19 Sep 2017 01:38:10 +0000 (01:38 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89 am: 74bd3daaac
am: b3bc234dfa

Change-Id: I5df968dbf00665d3bfdd451dc4e03fda055c371a

6 years agoMerge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89
Pengquan Meng [Tue, 19 Sep 2017 01:31:24 +0000 (01:31 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information" am: 2bcc7fac89
am: 74bd3daaac

Change-Id: Idc00a34295cdcbefa19636643bff3c3bf2323446

6 years agoMerge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev am: 9b1a9b4fb9
Pawin Vongmasa [Tue, 19 Sep 2017 01:30:01 +0000 (01:30 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev am: 9b1a9b4fb9
am: 729cb8b2b5

Change-Id: If4ab02ad02b39e197b15d3b1b9c9eef6e4a87cdd

6 years agoMerge "Incorrect decoding when TP-OA contains non-integer information"
Pengquan Meng [Tue, 19 Sep 2017 01:23:53 +0000 (01:23 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"
am: 2bcc7fac89

Change-Id: I4bddee5b8cf19715db56e7286a05f76be530928d

6 years agoMerge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
Pawin Vongmasa [Tue, 19 Sep 2017 01:22:34 +0000 (01:22 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
am: 9b1a9b4fb9

Change-Id: Ibdfb6f003c7467f58c9232d807d52b327e2187af

6 years agoMerge "Incorrect decoding when TP-OA contains non-integer information"
Pengquan Meng [Tue, 19 Sep 2017 01:14:34 +0000 (01:14 +0000)]
Merge "Incorrect decoding when TP-OA contains non-integer information"

6 years agoMerge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 01:14:05 +0000 (01:14 +0000)]
Merge "Rename "bitrate-control" to "bitrate-modes"" into oc-mr1-dev

6 years agoMerge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
Santos Cordon [Tue, 19 Sep 2017 00:55:43 +0000 (00:55 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev am: f7771c9f77
am: a17abfef56

Change-Id: Idf89c63e91b0677799b3b48aff3f19fd08792998

6 years agoMerge "Fix missing RequiredPermission annotation." into oc-mr1-dev
Santos Cordon [Tue, 19 Sep 2017 00:47:52 +0000 (00:47 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev
am: f7771c9f77

Change-Id: Ib569f91269f75ee288dc515505f9a46b0dbe61c9

6 years agoMerge "Fix missing RequiredPermission annotation." into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 00:41:04 +0000 (00:41 +0000)]
Merge "Fix missing RequiredPermission annotation." into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ae1e26564b -s ours
Bill Yi [Tue, 19 Sep 2017 00:32:31 +0000 (00:32 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: ae1e26564b  -s ours
am: 21310fde50  -s ours

Change-Id: I81ecaa6131fb498660843c9fc9f6c78d6a94ae32

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Tue, 19 Sep 2017 00:26:02 +0000 (00:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: ae1e26564b  -s ours

Change-Id: I2fff03813084209468b1835d6f2089a4c841fe3c

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Tue, 19 Sep 2017 00:19:44 +0000 (00:19 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 23:31:40 +0000 (23:31 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoSet use low res snapshots for low ram devices missing in theme snapshot
Matthew Ng [Mon, 18 Sep 2017 23:29:46 +0000 (16:29 -0700)]
Set use low res snapshots for low ram devices missing in theme snapshot

Creating new tasksnapshot from app theme was missing to set the reduced
flag to true.

Test: settings to smart lock and pass pattern/password
Bug: 65534047
Change-Id: I78e9fed223ffc4c7a9cb8d31836b18f1fc4e7d34

6 years agoMerge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev am: bbd01422d3
Santos Cordon [Mon, 18 Sep 2017 22:49:06 +0000 (22:49 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev am: bbd01422d3
am: 211cd1bd3d

Change-Id: I383642287235cdda5cefd4962e24bb74cd7c3041

6 years agoMerge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev...
Felipe Leme [Mon, 18 Sep 2017 22:39:36 +0000 (22:39 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev am: e15b1c953f
am: 764df64d3c

Change-Id: Ibb385e4d78e09a193976644854e8da2adc442659

6 years agoMerge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
Santos Cordon [Mon, 18 Sep 2017 22:38:36 +0000 (22:38 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
am: bbd01422d3

Change-Id: I41c6869f6514496a5dfc615ef7763f06b6fe1dbd

6 years agoMerge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 22:30:27 +0000 (22:30 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
am: e15b1c953f

Change-Id: Ia5d23edaca925ca762c14071e8bf0556019e6e0c

6 years agoMerge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev
TreeHugger Robot [Mon, 18 Sep 2017 22:23:58 +0000 (22:23 +0000)]
Merge "Move VR Display Policy check to after wakefulness." into oc-mr1-dev

6 years agoIncorrect decoding when TP-OA contains non-integer information
Erika Avenberg [Sat, 30 Aug 2014 10:00:47 +0000 (12:00 +0200)]
Incorrect decoding when TP-OA contains non-integer information

When receiving a GSM SMS message where the TP-Originating-Address
(TP-OA) field contains non-integer information, it is currently
decoded incorrectly.

This CL adds support for decoding BCD according to spec:
ETSI TS 123 040 V9.3.0

Section: 9.1.2.3 Semi-octet representation
"If a mobile receives an address field containing non-integer
 information in the semi-octets other than "1111" (e.g. 1110)
 it shall display the semi-octet as the representation given
 in GSM 44.008 [12] under "called BCD number", viz 1010="*",
 1011="#", 1100="a", 1101="b", 1110="c"."

Bug: 65042708
Test: runtest --path frameworks/opt/telephony/tests/telephonytests/src/com/android/internal/telephony/GsmSmsTest.java --test-method testAddressing
Change-Id: Ied2d6ca4d84d5c3ca6cc5c4d9875d2ff2a8e5df9

6 years agoMerge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc...
Eric Laurent [Mon, 18 Sep 2017 22:17:08 +0000 (22:17 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev am: 64254ff6a4
am: 60392a5fd7

Change-Id: Iaa976b7b8e719595202ee12f33368debcd3cdf47

6 years agoMerge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev
TreeHugger Robot [Mon, 18 Sep 2017 22:13:31 +0000 (22:13 +0000)]
Merge "Fixed padding of autofill service icon on Save affordance." into oc-mr1-dev

6 years agoMerge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc...
Eric Laurent [Mon, 18 Sep 2017 22:09:30 +0000 (22:09 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev
am: 64254ff6a4

Change-Id: Ie33d6f662fb7ca3f52ed3a71c29d7f2d8c722a8d

6 years agoDestroy vold socket interface completely.
Jeff Sharkey [Fri, 15 Sep 2017 22:05:19 +0000 (16:05 -0600)]
Destroy vold socket interface completely.

Long live Binder.

Test: yes
Bug: 13758960
Change-Id: I08e8c513b1dea217d64d06e9d8bec6171c8afdaf

6 years agoMerge "Add owners file for sysui"
TreeHugger Robot [Mon, 18 Sep 2017 21:57:02 +0000 (21:57 +0000)]
Merge "Add owners file for sysui"

6 years agoMerge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc...
TreeHugger Robot [Mon, 18 Sep 2017 21:53:33 +0000 (21:53 +0000)]
Merge "AudioService: reduce EU volume warning thresdhold for USB headsets" into oc-mr1-dev

6 years agoMerge "Improve StrictMode CTS Testing"
Kurt Nelson [Mon, 18 Sep 2017 21:40:33 +0000 (21:40 +0000)]
Merge "Improve StrictMode CTS Testing"

6 years agoMerge "Extended/Updated tests for PHONE_NUMBERS_EQUAL"
Francisco Pimenta [Mon, 18 Sep 2017 21:38:52 +0000 (21:38 +0000)]
Merge "Extended/Updated tests for PHONE_NUMBERS_EQUAL"

6 years agoMerge "Use dedicated handlers in UserController"
Fyodor Kupolov [Mon, 18 Sep 2017 21:38:42 +0000 (21:38 +0000)]
Merge "Use dedicated handlers in UserController"

6 years agoMerge "Added more metrics for Autofill:" into oc-mr1-dev am: d4f72ac3c4
Felipe Leme [Mon, 18 Sep 2017 21:26:55 +0000 (21:26 +0000)]
Merge "Added more metrics for Autofill:" into oc-mr1-dev am: d4f72ac3c4
am: b093daa296

Change-Id: Iae09ba2c6a082b87b74bd05320222955bde30dda

6 years agoMerge "Added more metrics for Autofill:" into oc-mr1-dev
Felipe Leme [Mon, 18 Sep 2017 21:20:23 +0000 (21:20 +0000)]
Merge "Added more metrics for Autofill:" into oc-mr1-dev
am: d4f72ac3c4

Change-Id: I46c2bb4e865c06a84245800dddb0fe018d8a52af

6 years agoMerge "Added more metrics for Autofill:" into oc-mr1-dev
TreeHugger Robot [Mon, 18 Sep 2017 21:05:44 +0000 (21:05 +0000)]
Merge "Added more metrics for Autofill:" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 21:04:47 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours am...
Bill Yi [Mon, 18 Sep 2017 20:56:20 +0000 (20:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 6c4c6b047c  -s ours
am: d33ed97339  -s ours

Change-Id: I209a4d9e4a7cfa4c019fa1d7c87a53e1298b1a71

6 years agoMerge "Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 ...
Bill Yi [Mon, 18 Sep 2017 20:52:38 +0000 (20:52 +0000)]
Merge "Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours am: cda0464f7d  -s ours" into oc-mr1-dev-plus-aosp
am: 92b6a2f2da  -s ours

Change-Id: Ia83c0e9230bb2136065ba199f274892d88be4607

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours am...
Bill Yi [Mon, 18 Sep 2017 20:41:03 +0000 (20:41 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours am: 728b23a934  -s ours
am: 8bd92a279f  -s ours

Change-Id: Id8abbab3a751aa922d892953ecc8754ecfe8c583

6 years agoMerge "Merge "Clarified how to set for autofill views representing creditcard expirat...
Felipe Leme [Mon, 18 Sep 2017 20:37:44 +0000 (20:37 +0000)]
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am: daf9b2ee15" into oc-mr1-dev-plus-aosp
am: 606f2d1b93

Change-Id: I704f41d28f27c6c1559ab778cd49c35169995fc5

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours...
Bill Yi [Mon, 18 Sep 2017 20:33:28 +0000 (20:33 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours am: d65cbc4442  -s ours
am: 46d9bb98d5  -s ours

Change-Id: Id1d57e614d56ba6829950e83f2243dd44b304925

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours am...
Bill Yi [Mon, 18 Sep 2017 20:31:42 +0000 (20:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours
am: 6c4c6b047c  -s ours

Change-Id: I033bbb7c0fa44047a3d160795f4ef4da5ed8aa92

6 years agoMerge "[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions"
TreeHugger Robot [Mon, 18 Sep 2017 20:30:53 +0000 (20:30 +0000)]
Merge "[RefactoredBMS] Correct scope of "disabled?" check viz backup/restore decisions"

6 years agoMerge "Import translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 ...
Android Build Merger (Role) [Mon, 18 Sep 2017 20:27:53 +0000 (20:27 +0000)]
Merge "Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours am: cda0464f7d  -s ours" into oc-mr1-dev-plus-aosp

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours...
Bill Yi [Mon, 18 Sep 2017 20:26:07 +0000 (20:26 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours
am: cda0464f7d  -s ours

Change-Id: Iaf01d0652c1f3bf3ea9ed8f635a154f07b47f9d7

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours am...
Bill Yi [Mon, 18 Sep 2017 20:24:21 +0000 (20:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours am: 60af01bec9  -s ours
am: 728b23a934  -s ours

Change-Id: I2d7def5a1bce48ce826a43541e1255a8a4e1e44f

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 20:21:31 +0000 (20:21 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Merge "Clarified how to set for autofill views representing creditcard expirat...
Android Build Merger (Role) [Mon, 18 Sep 2017 20:19:10 +0000 (20:19 +0000)]
Merge "Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev am: daf9b2ee15" into oc-mr1-dev-plus-aosp

6 years agoMerge "Clarified how to set for autofill views representing creditcard expiration...
Felipe Leme [Mon, 18 Sep 2017 20:17:37 +0000 (20:17 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev
am: daf9b2ee15

Change-Id: I5fa55acdf7b8328be82410144155ee019d096c2d

6 years agoMerge "DngCreator: Don't use default locale for writing date/time into DNG" into...
Eino-Ville Talvala [Mon, 18 Sep 2017 20:17:20 +0000 (20:17 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev am: 7c1f9cd750
am: 6e70e977df

Change-Id: I5d482de95a494d73667a6abbea42bf3f5e29c8aa

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours
Bill Yi [Mon, 18 Sep 2017 20:16:43 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours
am: 60af01bec9  -s ours

Change-Id: Ib420dbea84af5bec2926bb2abcf804038c977634

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea -s ours
Bill Yi [Mon, 18 Sep 2017 20:16:41 +0000 (20:16 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am: 69ca32dcea  -s ours
am: 60af01bec9  -s ours

Change-Id: I920bb3060556824d8185701b10ea71828e242591

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours...
Bill Yi [Mon, 18 Sep 2017 20:16:10 +0000 (20:16 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours am: c49cdb6749  -s ours
am: d65cbc4442  -s ours

Change-Id: I188322b3a1efdb1dea4fbe3b85f2d749ffffbe45

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
Bill Yi [Mon, 18 Sep 2017 20:07:14 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 69ca32dcea  -s ours

Change-Id: I59c5213db2534724e11d0eadf049d9d5489ffa18

6 years agoMerge "DngCreator: Don't use default locale for writing date/time into DNG" into...
Eino-Ville Talvala [Mon, 18 Sep 2017 20:06:43 +0000 (20:06 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev
am: 7c1f9cd750

Change-Id: I4a8dab62082f80452bf3eb003486e5d0febdd820

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours...
Bill Yi [Mon, 18 Sep 2017 20:05:45 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours
am: c49cdb6749  -s ours

Change-Id: Ief5061ef3933b7e1447e235923a52d741fc8fa7e

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours...
Bill Yi [Mon, 18 Sep 2017 20:05:44 +0000 (20:05 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours am: 456c147827  -s ours
am: c49cdb6749  -s ours

Change-Id: I74302ee3485e173533f9ba3bbe26f83d11e1ebe4

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours am: fee3748d04 -s ours
Bill Yi [Mon, 18 Sep 2017 19:56:59 +0000 (19:56 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours am: fee3748d04  -s ours
am: 456c147827  -s ours

Change-Id: I029764bb19cc295e4749d8974461f6d6be23d5c2

6 years agoMerge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 18 Sep 2017 19:48:37 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:47:53 +0000 (19:47 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoAdd owners file for sysui
Jason Monk [Mon, 18 Sep 2017 19:45:15 +0000 (15:45 -0400)]
Add owners file for sysui

Test: none
Change-Id: I1fa120661eba67e1d9c1dd179076e86f3e7e3663

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 19:32:08 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE

Change-Id: I27beea6fcadb30aad65e7b3f510970fcbed10051
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Mon, 18 Sep 2017 19:31:18 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:31:00 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:30:26 +0000 (19:30 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Clarified how to set for autofill views representing creditcard expiration...
TreeHugger Robot [Mon, 18 Sep 2017 19:29:46 +0000 (19:29 +0000)]
Merge "Clarified how to set for autofill views representing creditcard expiration dates." into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 19:22:28 +0000 (12:22 -0700)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

Bug: 64712476
Change-Id: Ib6808e51d755433df1e51f6f3ba3478c40233527

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 18 Sep 2017 19:20:43 +0000 (19:20 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoImport translations. DO NOT MERGE am: 791ebeed32 -s ours
Bill Yi [Mon, 18 Sep 2017 19:16:08 +0000 (19:16 +0000)]
Import translations. DO NOT MERGE am: 791ebeed32  -s ours
am: fee3748d04  -s ours

Change-Id: I4d666020e912f122850cc140e3f62d65aea029ca

6 years agoFixed padding of autofill service icon on Save affordance.
Felipe Leme [Sat, 16 Sep 2017 01:56:26 +0000 (18:56 -0700)]
Fixed padding of autofill service icon on Save affordance.

Test: manual verification
Test: cts-tradefed run commandAndExit cts-dev -m CtsAutoFillServiceTestCases

Fixes: 65739885

Change-Id: Ia2b63750665eefd36143074c4cf0e1310de056b2

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 19:12:17 +0000 (12:12 -0700)]
Import translations. DO NOT MERGE

Change-Id: I737e49011cb4e2c330c912c2138e29ddaf1d1d42
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import

6 years agoMerge "DngCreator: Don't use default locale for writing date/time into DNG" into...
TreeHugger Robot [Mon, 18 Sep 2017 19:10:11 +0000 (19:10 +0000)]
Merge "DngCreator: Don't use default locale for writing date/time into DNG" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 18 Sep 2017 19:09:21 +0000 (19:09 +0000)]
Import translations. DO NOT MERGE
am: 791ebeed32  -s ours

Change-Id: Iff6d60fe8fd1444c88ffa76634a50a4bb377334d