OSDN Git Service

android-x86/frameworks-base.git
8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am: 7d09db2830
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:10:47 +0000 (16:10 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c am: 7d09db2830
am: 81368e08e0

Change-Id: Ifa2ca4ef2b9144db318b61cd248000c6e3eb96fe

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:07:49 +0000 (16:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am: 7d09db2830

Change-Id: I57f72e630688d91ca56adfb910232358746777e0

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64
(cherry picked from commit aa021e854ef84f7a7aff109b5bec824190f9ebfa)

8 years agoMerge \\\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:35:00 +0000 (15:35 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 9feb501659
am: 2b59387499

Change-Id: I65b9ecc84c763721ce5c943fdd9a7f682f770da4

8 years agoMerge \\\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:29:56 +0000 (15:29 +0000)]
Merge \\\"Fix that work apps settings page crash after changing work profile to use separated lock\\\" into nyc-dev am: 6437205648 am: 1e29965a85
am: bba7856588

Change-Id: Iba5f5f63a78e7f9e68465fa5598d6c6baf555771

8 years agoMerge \\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:28:55 +0000 (15:28 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 9feb501659

Change-Id: I0cd6a92a70d8f3310ab1a07709aefe6d42a57412

8 years agoMerge \\"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:24:23 +0000 (15:24 +0000)]
Merge \\"Fix that work apps settings page crash after changing work profile to use separated lock\\" into nyc-dev am: 6437205648
am: 1e29965a85

Change-Id: Iad489061a9f91d17097f45ff10da50f9210733a1

8 years agoMerge \"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:21:12 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: Id19fe2488406a3891cd433d8b1e9273a28b48fbb

8 years agoMerge \"Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:21:07 +0000 (15:21 +0000)]
Merge \"Fix that work apps settings page crash after changing work profile to use separated lock\" into nyc-dev
am: 6437205648

Change-Id: If23d7b5ab2c79874714a9f6a67625b09e7f83699

8 years agoMerge "Fix that work apps settings page crash after changing work profile to use...
Victor Chang [Thu, 16 Jun 2016 15:13:32 +0000 (15:13 +0000)]
Merge "Fix that work apps settings page crash after changing work profile to use separated lock" into nyc-dev

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 14:15:17 +0000 (15:15 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

test-current.txt update

Bug: 28666126
Change-Id: Ib03eaba0277fbfbd3088044651295971aebf7a64

8 years agoMerge "DatePicker A11Y fix time announced for date widgets"
Andrei Stingaceanu [Thu, 16 Jun 2016 13:41:49 +0000 (13:41 +0000)]
Merge "DatePicker A11Y fix time announced for date widgets"

8 years agoMerge \\\\"API updated for ICU4J 57.1\\\\" am: 4861329f57 am: 438dc91a41 am: 69147f24ae
Joachim Sauer [Thu, 16 Jun 2016 13:17:47 +0000 (13:17 +0000)]
Merge \\\\"API updated for ICU4J 57.1\\\\" am: 4861329f57 am: 438dc91a41 am: 69147f24ae
am: 3ac8348d00

Change-Id: I811b6eabe9587c704afac941bbf1385798f7957b

8 years agoMerge \\\"API updated for ICU4J 57.1\\\" am: 4861329f57 am: 438dc91a41
Fredrik Roubert [Thu, 16 Jun 2016 13:12:13 +0000 (13:12 +0000)]
Merge \\\"API updated for ICU4J 57.1\\\" am: 4861329f57 am: 438dc91a41
am: 69147f24ae

Change-Id: Ic62119248aeef08141a3f6a9b2d948529997cbcc

8 years agoMerge \\"API updated for ICU4J 57.1\\" am: 4861329f57
Joachim Sauer [Thu, 16 Jun 2016 13:09:12 +0000 (13:09 +0000)]
Merge \\"API updated for ICU4J 57.1\\" am: 4861329f57
am: 438dc91a41

Change-Id: I16a88e2346435b60cc7844784f30be82a775bf5d

8 years agoMerge \"API updated for ICU4J 57.1\"
Fredrik Roubert [Thu, 16 Jun 2016 13:03:50 +0000 (13:03 +0000)]
Merge \"API updated for ICU4J 57.1\"
am: 4861329f57

Change-Id: I28a8fe77f81a0cb24ed7044046c06677b44c812c

8 years agoMerge \\\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\\" am...
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:46:19 +0000 (12:46 +0000)]
Merge \\\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\\" am: 47ef3bf172 am: d37e23c50c am: 720f31e238
am: 90e517991b

Change-Id: Iac9e82f2ca567d8f56d556f5dd0a8339cccb153e

8 years agoMerge \\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\" am:...
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:42:40 +0000 (12:42 +0000)]
Merge \\\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\\" am: 47ef3bf172 am: d37e23c50c
am: 720f31e238

Change-Id: I97f561820d6cb9550e92c2bf2b83017889afc069

8 years agoMerge "API updated for ICU4J 57.1"
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"

8 years agoMerge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:38:20 +0000 (12:38 +0000)]
Merge \\"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\\" am: 47ef3bf172
am: d37e23c50c

Change-Id: I852b8efb010fecf7079679694c45d6d8300ea408

8 years agoMerge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am: 47ef3bf172

Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368

8 years agoMerge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c"

8 years agoTrack libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:07:31 +0000 (13:07 +0100)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c

Bug: 28666126
Change-Id: I52b859a5504536413f74c1e27d3eb7f1f930dc20

8 years agoDatePicker A11Y fix time announced for date widgets
Andrei Stingaceanu [Thu, 16 Jun 2016 11:00:39 +0000 (12:00 +0100)]
DatePicker A11Y fix time announced for date widgets

* introduced a new method (getFormattedCurrentDate) which formats
the date for all DatePickerDelegates
* implemented (moved) onPopulateAccessibilityEvent in the
AbstractDatePickerDelegate thus all announcements for date pickers
use the same format
* note: added FORMAT_SHOW_WEEKDAY to the current format because
I find the information valuable

E.g:
* Before: "Thu Jun 16 11:49:14 GMT+01:00 2016"
* Now: "Thursday, 16 June 2016"

Bug: 29099922
Change-Id: I94447067f10659747ae310f9e07cf3f487c97e05

8 years agoMerge \"Merge \\\"Add permission checking on service calls in LockSettingsService...
Ricky Wai [Thu, 16 Jun 2016 10:47:56 +0000 (10:47 +0000)]
Merge \"Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am: 43f6a45e7e am: 18c57b5cd5\" into nyc-mr1-dev-plus-aosp
am: fcc785679d

Change-Id: I9d116b86cc17f8fb48db317470fc1c4cf8a6e757

8 years agoMerge \\\"Add permission checking on service calls in LockSettingsService\\\" into...
Ricky Wai [Thu, 16 Jun 2016 10:47:53 +0000 (10:47 +0000)]
Merge \\\"Add permission checking on service calls in LockSettingsService\\\" into nyc-dev am: 43f6a45e7e am: c42f5c4410
am: 95e27c77a4

Change-Id: I261cd65884f81d68a7c20e4653c3f5a5d336e032

8 years agoMerge "Merge \\"Add permission checking on service calls in LockSettingsService\...
Android Build Merger (Role) [Thu, 16 Jun 2016 10:43:33 +0000 (10:43 +0000)]
Merge "Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e am: 18c57b5cd5" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Add permission checking on service calls in LockSettingsService\\" into...
Ricky Wai [Thu, 16 Jun 2016 10:42:58 +0000 (10:42 +0000)]
Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e
am: 18c57b5cd5

Change-Id: I0d8d74bee55f6431a2a61d26d6a54de2d67a33c4

8 years agoMerge \\"Add permission checking on service calls in LockSettingsService\\" into...
Ricky Wai [Thu, 16 Jun 2016 10:42:56 +0000 (10:42 +0000)]
Merge \\"Add permission checking on service calls in LockSettingsService\\" into nyc-dev am: 43f6a45e7e
am: c42f5c4410

Change-Id: Ic0d56aafaeb72135fba107616a664f9845bd81f8

8 years agoMerge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
Ricky Wai [Thu, 16 Jun 2016 10:39:03 +0000 (10:39 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: If6535443baacec9fc1af2ed376c3ffa25f677103

8 years agoMerge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
Ricky Wai [Thu, 16 Jun 2016 10:38:46 +0000 (10:38 +0000)]
Merge \"Add permission checking on service calls in LockSettingsService\" into nyc-dev
am: 43f6a45e7e

Change-Id: I061297e1cd98535f666141ea7709d97c3b490f60

8 years agoMerge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: d58da1be76...
Bill Yi [Thu, 16 Jun 2016 10:36:16 +0000 (10:36 +0000)]
Merge \"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: d58da1be76  -s ours am: cf0bd1675c  -s ours\" into nyc-mr1-dev-plus-aosp
am: 8416e044dd  -s ours

Change-Id: I4f47eb45618d71fa87bee827a098847bd2742c99

8 years agoMerge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: d58da1be76 -s ours...
Bill Yi [Thu, 16 Jun 2016 10:36:08 +0000 (10:36 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: d58da1be76  -s ours am: 1ddd928abf  -s ours
am: 9ba43c837c  -s ours

Change-Id: I1ecfc5b0126950593798a4f0dfecd98f089c4fe7

8 years agoMerge "Add permission checking on service calls in LockSettingsService" into nyc-dev
Ricky Wai [Thu, 16 Jun 2016 10:33:22 +0000 (10:33 +0000)]
Merge "Add permission checking on service calls in LockSettingsService" into nyc-dev

8 years agoMerge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76...
Android Build Merger (Role) [Thu, 16 Jun 2016 10:30:29 +0000 (10:30 +0000)]
Merge "Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76  -s ours am: cf0bd1675c  -s ours" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours
Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76  -s ours
am: 1ddd928abf  -s ours

Change-Id: I130fc02f0118dccfc237edb34f077e92c0dfaa2f

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76 -s ours
Bill Yi [Thu, 16 Jun 2016 10:30:01 +0000 (10:30 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: d58da1be76  -s ours
am: cf0bd1675c  -s ours

Change-Id: Ie9feffc019d1b9c6ae956596c3f1a367700ee39d

8 years agoMerge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev...
Robin Lee [Thu, 16 Jun 2016 10:26:41 +0000 (10:26 +0000)]
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 3e343ffd91 am: c9ac672d85
am: 741cea0d89

Change-Id: I245d528bc6653d52de944732fceccb3c1d542c3c

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:26:34 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76  -s ours

Change-Id: I892cb57187ad5229701d24112490ac48182c5319

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:26:32 +0000 (10:26 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: d58da1be76  -s ours

Change-Id: I8f6a3c344ce19bf7dbdf3882e393627ed8029d46

8 years agoMerge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am:...
Robin Lee [Thu, 16 Jun 2016 10:21:39 +0000 (10:21 +0000)]
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 3e343ffd91
am: c9ac672d85

Change-Id: I12cdcac2581a062313dfc0c854a184485f5fc718

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev...
Robin Lee [Thu, 16 Jun 2016 10:18:43 +0000 (10:18 +0000)]
Merge \\\"Move \\\'is already always-on\\\' check into Vpn.java\\\" into nyc-dev am: 3e343ffd91 am: 0e7abd3fba
am: 9434b7cde4

Change-Id: I525ebc4b6c27eff17ff57fac7f664c221cbc2954

8 years agoMerge \"Merge \\"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am...
Bill Yi [Thu, 16 Jun 2016 10:14:23 +0000 (10:14 +0000)]
Merge \"Merge \\"Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 65266b99d2  -s ours\\" into nyc-mr1-dev am: 74ab23803c  -s ours\" into nyc-mr1-dev-plus-aosp
am: c02f85f0cd  -s ours

Change-Id: I120e278e1d8b8c88a0bfc58d065d7b293b4f1171

8 years agoMerge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c985571e5e...
Bill Yi [Thu, 16 Jun 2016 10:14:16 +0000 (10:14 +0000)]
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: c985571e5e  -s ours\" into nyc-mr1-dev-plus-aosp
am: a092dcaa1c  -s ours

Change-Id: Id6bc13221408023dd4376f955743bb2415e05c6f

8 years agoMerge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 65266b99d2 -s ours...
Bill Yi [Thu, 16 Jun 2016 10:14:11 +0000 (10:14 +0000)]
Merge \\\"Import translations. DO NOT MERGE\\\" into nyc-dev am: 65266b99d2  -s ours am: f924f2130f  -s ours
am: 7c00e15378  -s ours

Change-Id: I46cf8b8313224c4e4b85a0b02368aa5f9a180395

8 years agoMerge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am:...
Robin Lee [Thu, 16 Jun 2016 10:14:06 +0000 (10:14 +0000)]
Merge \\"Move \\'is already always-on\\' check into Vpn.java\\" into nyc-dev am: 3e343ffd91
am: 0e7abd3fba

Change-Id: I897c48083f8e6786182d023c58f9861996c6d25c

8 years agoMerge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: Id363cef8369d63ce4739089d94139e34ed25f665

8 years agoMerge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:10:23 +0000 (10:10 +0000)]
Merge \"Move \'is already always-on\' check into Vpn.java\" into nyc-dev
am: 3e343ffd91

Change-Id: I6532f2e654cfd9df8ee6c649344b0b915a8381c1

8 years agoMerge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b9...
Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:50 +0000 (10:09 +0000)]
Merge "Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours\" into nyc-mr1-dev am: 74ab23803c  -s ours" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: c985571e5e...
Android Build Merger (Role) [Thu, 16 Jun 2016 10:09:37 +0000 (10:09 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev am: c985571e5e  -s ours" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5ed24ad6c3 -s...
Bill Yi [Thu, 16 Jun 2016 10:09:23 +0000 (10:09 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 5ed24ad6c3  -s ours
am: 206ac49f44  -s ours

Change-Id: If5836f87a9baa954bc0fa72313a7f5e9cf1a74ff

8 years agoMerge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2...
Bill Yi [Thu, 16 Jun 2016 10:09:09 +0000 (10:09 +0000)]
Merge \"Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours\" into nyc-mr1-dev
am: 74ab23803c  -s ours

Change-Id: I548d5434c7fcaf9e7d5588f948f7fda21d96c473

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:09:05 +0000 (10:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c985571e5e  -s ours

Change-Id: I5ea38f0c7f2ab572ba5adaa6df161136bf782e0d

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2 -s ours
Bill Yi [Thu, 16 Jun 2016 10:08:55 +0000 (10:08 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 65266b99d2  -s ours
am: f924f2130f  -s ours

Change-Id: Ie9b5a6e2814d4e7f7b7146c677aeed6932c5b11c

8 years agoMerge "Move 'is already always-on' check into Vpn.java" into nyc-dev
Robin Lee [Thu, 16 Jun 2016 10:06:10 +0000 (10:06 +0000)]
Merge "Move 'is already always-on' check into Vpn.java" into nyc-dev

8 years agoMerge "Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 65266b99d2 ...
Android Build Merger (Role) [Thu, 16 Jun 2016 10:03:53 +0000 (10:03 +0000)]
Merge "Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 65266b99d2  -s ours" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:03:34 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2  -s ours

Change-Id: I93855bfa75cc031fe4e4d1812c415ae359a34b5b

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 10:03:28 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 65266b99d2  -s ours

Change-Id: I633386b991908081feeaaf100554c7c455980c13

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:03:22 +0000 (10:03 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5ed24ad6c3  -s ours

Change-Id: I782614166a75a36f637de928b66d527b68413e69

8 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 16 Jun 2016 10:00:04 +0000 (10:00 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:57:54 +0000 (09:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Thu, 16 Jun 2016 09:54:35 +0000 (09:54 +0000)]
Merge "Import translations. DO NOT MERGE"

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 08:48:06 +0000 (01:48 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 08:42:16 +0000 (01:42 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 07:43:09 +0000 (00:43 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Cleanup Editor.java."
Keisuke Kuroyanagi [Thu, 16 Jun 2016 06:01:05 +0000 (06:01 +0000)]
Merge "Cleanup Editor.java."

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 05:10:07 +0000 (22:10 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 04:49:11 +0000 (21:49 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge \"Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into...
Selim Cinek [Thu, 16 Jun 2016 04:35:51 +0000 (04:35 +0000)]
Merge \"Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am: c1720dce1b am: 447ee99755\" into nyc-mr1-dev-plus-aosp
am: 39aa6dc11f

Change-Id: Ib1307bef33373299dc9d8b36144ab300d518e3fd

8 years agoMerge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc...
Selim Cinek [Thu, 16 Jun 2016 04:35:48 +0000 (04:35 +0000)]
Merge \\\"Added dismiss, expand, and collapse accessibility actions\\\" into nyc-dev am: c1720dce1b am: 0630d92064
am: 7a0051b68f

Change-Id: Ia1052c236a6dd85e694992db4f7515bab6c78764

8 years agoMerge "Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into...
Android Build Merger (Role) [Thu, 16 Jun 2016 04:31:04 +0000 (04:31 +0000)]
Merge "Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b am: 447ee99755" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev...
Selim Cinek [Thu, 16 Jun 2016 04:30:35 +0000 (04:30 +0000)]
Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 447ee99755

Change-Id: I92627b1729d042c41b72f5449831d3e8b7b29b0b

8 years agoMerge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev...
Selim Cinek [Thu, 16 Jun 2016 04:30:32 +0000 (04:30 +0000)]
Merge \\"Added dismiss, expand, and collapse accessibility actions\\" into nyc-dev am: c1720dce1b
am: 0630d92064

Change-Id: I01afc02fe75b0ae7223e9deba6355ed00961faaa

8 years agoMerge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I25bd41f1307233bba14067952086ca7be3118505

8 years agoMerge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
Selim Cinek [Thu, 16 Jun 2016 04:25:26 +0000 (04:25 +0000)]
Merge \"Added dismiss, expand, and collapse accessibility actions\" into nyc-dev
am: c1720dce1b

Change-Id: I14674254eb79fef58e4dcb1a8d7ecaab24831691

8 years agoMerge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 16 Jun 2016 02:28:09 +0000 (19:28 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge \"Remove coarse location pre-grant for preinstalled VrListenerServices. am...
Ruben Brunk [Thu, 16 Jun 2016 01:52:41 +0000 (01:52 +0000)]
Merge \"Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be am: 268a22feb6\" into nyc-mr1-dev-plus-aosp
am: 698d5c573c

Change-Id: I30c69ffe3b190b96284aecdedb5013fdcf172396

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be...
Ruben Brunk [Thu, 16 Jun 2016 01:52:38 +0000 (01:52 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be am: c3e651cb52
am: f11683b6da

Change-Id: I38de7ce2c26e1c4f2366752ffad448b58512ab95

8 years agoMerge "Remove coarse location pre-grant for preinstalled VrListenerServices. am:...
Android Build Merger (Role) [Thu, 16 Jun 2016 01:43:12 +0000 (01:43 +0000)]
Merge "Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be am: 268a22feb6" into nyc-mr1-dev-plus-aosp

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
Ruben Brunk [Thu, 16 Jun 2016 01:42:48 +0000 (01:42 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
am: 268a22feb6

Change-Id: Ib006f8deafe32c69ffab5360c8bb6d4a18f9f9a8

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
Ruben Brunk [Thu, 16 Jun 2016 01:42:33 +0000 (01:42 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices. am: d430f1a0be
am: c3e651cb52

Change-Id: I395fff24aac498d85703cebcba3c066dff23a19a

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices.
Ruben Brunk [Thu, 16 Jun 2016 01:37:29 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am: d430f1a0be

Change-Id: I9501d2926246f5f83ef24a5105323d8e43807608

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices.
Ruben Brunk [Thu, 16 Jun 2016 01:37:26 +0000 (01:37 +0000)]
Remove coarse location pre-grant for preinstalled VrListenerServices.
am: d430f1a0be

Change-Id: Ibd5f32c4afe864167411c3876e5ab0cc4de33293

8 years agoMerge \"Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev...
Ruben Brunk [Thu, 16 Jun 2016 01:04:26 +0000 (01:04 +0000)]
Merge \"Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am: 931a7c03e0 am: 336a7cb9b5\" into nyc-mr1-dev-plus-aosp
am: e823f9ea26

Change-Id: I9f84dd9b83de294dbafc507db6d9c280d8cfb1a7

8 years agoMerge \"Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into...
Mihai Niță [Thu, 16 Jun 2016 01:04:23 +0000 (01:04 +0000)]
Merge \"Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am: c8c9afeacb am: d80a8e8fe7\" into nyc-mr1-dev-plus-aosp
am: 314e4f73d8

Change-Id: Idc50ec1acd07bcf4a363a1c5d13d6de92293f6b3

8 years agoMerge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am: 931a7c0...
Ruben Brunk [Thu, 16 Jun 2016 01:04:20 +0000 (01:04 +0000)]
Merge \\\"Fix VR transition for display on/off sequence.\\\" into nyc-dev am: 931a7c03e0 am: fafe810a61
am: 0dc7b8af98

Change-Id: Ib4afffdb096401999669887eacf7eeba6078587c

8 years agoMerge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev...
Mihai Nita [Thu, 16 Jun 2016 01:04:17 +0000 (01:04 +0000)]
Merge \\\"Fix for NullPointerException in SuggestedLocaleAdapter\\\" into nyc-dev am: c8c9afeacb am: 44080ac5bf
am: ba183ff406

Change-Id: Ic812636f47ec7fd348e00d2d2bb7df883e5ab8cd

8 years agoRemove coarse location pre-grant for preinstalled VrListenerServices.
Ruben Brunk [Thu, 16 Jun 2016 00:55:41 +0000 (17:55 -0700)]
Remove coarse location pre-grant for preinstalled VrListenerServices.

Bug: 28919229
Change-Id: I97393308129c65ef2822014775d3e77e25dc21e6

8 years agoMerge "Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am...
Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:14 +0000 (00:43 +0000)]
Merge "Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0 am: 336a7cb9b5" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc...
Android Build Merger (Role) [Thu, 16 Jun 2016 00:43:01 +0000 (00:43 +0000)]
Merge "Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb am: d80a8e8fe7" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
Ruben Brunk [Thu, 16 Jun 2016 00:42:24 +0000 (00:42 +0000)]
Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
am: 336a7cb9b5

Change-Id: I47d538ee1128a00cab1a7a2e375edf5d9c519cf7

8 years agoMerge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am...
Mihai Niță [Thu, 16 Jun 2016 00:42:23 +0000 (00:42 +0000)]
Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
am: d80a8e8fe7

Change-Id: Ia714522456f1526db276046cb12973df7193b102

8 years agoMerge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
Ruben Brunk [Thu, 16 Jun 2016 00:42:03 +0000 (00:42 +0000)]
Merge \\"Fix VR transition for display on/off sequence.\\" into nyc-dev am: 931a7c03e0
am: fafe810a61

Change-Id: I9e1e7ed21669000c664c3a59c681bf706c574907

8 years agoMerge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am...
Mihai Niță [Thu, 16 Jun 2016 00:41:59 +0000 (00:41 +0000)]
Merge \\"Fix for NullPointerException in SuggestedLocaleAdapter\\" into nyc-dev am: c8c9afeacb
am: 44080ac5bf

Change-Id: Ib9f1021c18187364d23058fdff39405a00402efe

8 years agoMerge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e...
Amith Yamasani [Thu, 16 Jun 2016 00:38:32 +0000 (00:38 +0000)]
Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e am: c5ffdb9ee4
am: 5d016b2335

Change-Id: Id94501454ccecfa5dba5359aa224be55281c444d

8 years agoMerge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e...
Amith Yamasani [Thu, 16 Jun 2016 00:38:28 +0000 (00:38 +0000)]
Merge \\\"More thorough cleansing of expired users\\\" into nyc-dev am: 4f2b1b455e am: bf1301f542
am: 80027e9d93

Change-Id: I9f6040fb97c55aa5e01d00d5221a2c678227dab2