OSDN Git Service
Makoto Onuki [Thu, 16 Jun 2016 17:10:42 +0000 (17:10 +0000)]
Merge \"Shortcut: Reset throttling upon inline reply\" into nyc-mr1-dev
am:
489bafbb4b
Change-Id: I5c8dc7f3c1e5860ea870d88b2ff7fc2a86a4ba39
Dan Willemsen [Thu, 16 Jun 2016 17:07:15 +0000 (17:07 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master am:
5f551b3fdc
am:
fd1854cdfa
Change-Id: I6942aa753a512f0a24725de0ea72ed20c067ad15
Makoto Onuki [Thu, 16 Jun 2016 17:05:54 +0000 (17:05 +0000)]
Merge "Shortcut: Reset throttling upon inline reply" into nyc-mr1-dev
Dan Willemsen [Thu, 16 Jun 2016 17:01:55 +0000 (17:01 +0000)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
am:
5f551b3fdc
Change-Id: I327901f4bcca937a8376c1a6d604d7293828b0c9
Dan Willemsen [Thu, 16 Jun 2016 16:54:28 +0000 (09:54 -0700)]
resolve merge conflicts of
20d55a7 to stage-aosp-master
Change-Id: Ie2a1beb527ab60f8a3966a14e66330e69a148b59
Mahaver Chopra [Thu, 16 Jun 2016 16:53:43 +0000 (16:53 +0000)]
Merge \"Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem\" into nyc-mr1-dev
am:
186768150f
Change-Id: Id35463500a31ff6e6d834c706e228d05c5d15918
Mahaver Chopra [Thu, 16 Jun 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem" into nyc-mr1-dev
Android Build Merger (Role) [Thu, 16 Jun 2016 16:38:10 +0000 (16:38 +0000)]
Merge "Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83 am:
092d961367" into nyc-mr1-dev-plus-aosp
Todd Kennedy [Thu, 16 Jun 2016 16:37:44 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
092d961367
Change-Id: Ifbea2336bcb5a38ec71147e905a593b8b3f55416
Todd Kennedy [Thu, 16 Jun 2016 16:37:23 +0000 (16:37 +0000)]
Merge \\"Make sure we\\'re locked\\" into nyc-dev am:
32d67fab83
am:
e084a08ff5
Change-Id: I7cbdcd5d7e917fa290775260d3c30726948d4f4d
Todd Kennedy [Thu, 16 Jun 2016 16:34:34 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: I2f80a7af0ddd6f282cde6c8d9ea79e0c614fba6b
Todd Kennedy [Thu, 16 Jun 2016 16:34:11 +0000 (16:34 +0000)]
Merge \"Make sure we\'re locked\" into nyc-dev
am:
32d67fab83
Change-Id: Iff90d36636b01542ed8a7e088f403b6554cbd91a
Todd Kennedy [Thu, 16 Jun 2016 16:22:53 +0000 (16:22 +0000)]
Merge "Make sure we're locked" into nyc-dev
Yi Kong [Thu, 16 Jun 2016 16:21:03 +0000 (16:21 +0000)]
Merge \"Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92\" into nyc-dev-plus-aosp
am:
53cf79e185
Change-Id: I7444bfc95144d4d00c20347512a5a5fc0cceebc8
Yi Kong [Thu, 16 Jun 2016 16:17:48 +0000 (16:17 +0000)]
Merge "Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92" into nyc-dev-plus-aosp
Yi Kong [Mon, 13 Jun 2016 20:14:35 +0000 (21:14 +0100)]
Track libcore change
45f477557ddaf68cb2fe9603544b95c0e7af9a92
Change-Id: Id1de514f0fc46fead029036ad5aded8ec9899119
(cherry picked from commit
af823e0ebf987d5715d6df80b3c9335b4e3a2cdb)
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 16:07:49 +0000 (16:07 +0000)]
Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c
am:
7d09db2830
Change-Id: I57f72e630688d91ca56adfb910232358746777e0
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)
Treehugger Robot [Thu, 16 Jun 2016 15:56:50 +0000 (15:56 +0000)]
Merge "Remove unused link to libcutils"
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
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
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
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
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
Todd Kennedy [Wed, 15 Jun 2016 16:54:28 +0000 (09:54 -0700)]
Make sure we're locked
Before calling a method ending with LPw, we need to have the mPackages lock.
Make sure we do that.
Also, ditch the iterator for traversing an ArraySet.
Bug:
29356333
Change-Id: I67df971f2961b577f31153cef46fb153458d6965
Mahaver Chopra [Thu, 16 Jun 2016 13:05:58 +0000 (14:05 +0100)]
Global.OEM_UNLOCK_DISALLOWED should only restrict when enabling oem
Bug:
29409746
Change-Id: I5254456cc2364c93809cebbe2d134a873873790d
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
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
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
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
Joachim Sauer [Thu, 16 Jun 2016 12:38:29 +0000 (12:38 +0000)]
Merge "API updated for ICU4J 57.1"
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
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:33:21 +0000 (12:33 +0000)]
Merge \"Track libcore change I9138244ba1f30ec32b20c1c6394392742ffc3b2c\"
am:
47ef3bf172
Change-Id: I15352fb15ffb6d427ddf92cb084c2cfc4c0f8368
Przemyslaw Szczepaniak [Thu, 16 Jun 2016 12:26:51 +0000 (12:26 +0000)]
Merge "Track 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
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
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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 10:21:18 +0000 (10:21 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 10:03:44 +0000 (10:03 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 09:58:55 +0000 (09:58 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Thu, 16 Jun 2016 09:57:54 +0000 (09:57 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
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
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
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
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
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
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
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
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
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
TreeHugger Robot [Thu, 16 Jun 2016 04:19:47 +0000 (04:19 +0000)]
Merge "Added dismiss, expand, and collapse accessibility actions" into nyc-dev
Dan Willemsen [Wed, 15 Jun 2016 20:56:27 +0000 (13:56 -0700)]
Remove unused link to libcutils
This library is built against the NDK, so it shouldn't be linking to
platform libraries. It should also be pulling <android/log.h> from the
NDK headers, so remove the system/core/include include directory.
Change-Id: Ie9d6514f43492401697907aee4df56bdbf4e1926
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
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
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
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
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
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
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
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
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
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
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
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
Ruben Brunk [Thu, 16 Jun 2016 00:38:05 +0000 (00:38 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am:
931a7c03e0
Change-Id: I406724ea21cd7cfde2be6aa922ac636c7b7f23a8
Mihai Nita [Thu, 16 Jun 2016 00:37:54 +0000 (00:37 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Ib9d44296bbb851940a0da0a9a6234f2023dfef25
Ruben Brunk [Thu, 16 Jun 2016 00:34:32 +0000 (00:34 +0000)]
Merge \"Fix VR transition for display on/off sequence.\" into nyc-dev
am:
931a7c03e0
Change-Id: I70301a77d89271e74e69efb92f340f1dbf6b3ca8
Mihai Nita [Thu, 16 Jun 2016 00:34:30 +0000 (00:34 +0000)]
Merge \"Fix for NullPointerException in SuggestedLocaleAdapter\" into nyc-dev
am:
c8c9afeacb
Change-Id: Iaa4df1af4a18ad0bc4e99a5bd47aa8f6c1357e50
Amith Yamasani [Thu, 16 Jun 2016 00:33:25 +0000 (00:33 +0000)]
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am:
4f2b1b455e
am:
c5ffdb9ee4
Change-Id: I8c7bec8db8d0f9271e965fcef079e778b04409e7
Ruben Brunk [Thu, 16 Jun 2016 00:29:31 +0000 (00:29 +0000)]
Merge "Fix VR transition for display on/off sequence." into nyc-dev
Amith Yamasani [Thu, 16 Jun 2016 00:28:45 +0000 (00:28 +0000)]
Merge \\"More thorough cleansing of expired users\\" into nyc-dev am:
4f2b1b455e
am:
bf1301f542
Change-Id: Ie4250ddaa0175ff25a85abdbaa59a31b61003752
Mihai Niță [Thu, 16 Jun 2016 00:28:35 +0000 (00:28 +0000)]
Merge "Fix for NullPointerException in SuggestedLocaleAdapter" into nyc-dev
Ruben Brunk [Thu, 16 Jun 2016 00:08:35 +0000 (17:08 -0700)]
Fix VR transition for display on/off sequence.
- Ensure VR transition has been applied before display power
off sequence.
Bug:
29364940
Change-Id: I1224ac653d466919cb418e5c357a748606c4fd7d
Amith Yamasani [Thu, 16 Jun 2016 00:24:17 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am:
4f2b1b455e
Change-Id: Ia5388c84b89cdabefe666b483cebe40066e4d26a
Amith Yamasani [Thu, 16 Jun 2016 00:24:14 +0000 (00:24 +0000)]
Merge \"More thorough cleansing of expired users\" into nyc-dev
am:
4f2b1b455e
Change-Id: I5714f73a9b90c0cb8fee653abf799374acfc6232
Amith Yamasani [Thu, 16 Jun 2016 00:14:57 +0000 (00:14 +0000)]
Merge "More thorough cleansing of expired users" into nyc-dev
Mihai Nita [Wed, 15 Jun 2016 23:34:50 +0000 (16:34 -0700)]
Fix for NullPointerException in SuggestedLocaleAdapter
Bug:
28748150
Change-Id: Ide2d176d3bc0bb7529bf831b553db3ade37ddb69