Bill Yi
33b11b7822
Import translations. DO NOT MERGE
...
am: c5a1d40bf1
2016-10-18 05:44:03 +00:00
Bill Yi
28b2f5f023
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
...
am: e8dc857c2f
2016-10-18 05:38:09 +00:00
Bill Yi
d648bf6c97
Import translations. DO NOT MERGE
...
am: c11e301ca4
2016-10-18 05:38:08 +00:00
TreeHugger Robot
e8dc857c2f
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-10-18 05:31:41 +00:00
TreeHugger Robot
a74148ea54
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-18 05:31:01 +00:00
TreeHugger Robot
fb27d02b6b
Merge "Import translations. DO NOT MERGE" into cw-f-dev
2016-10-18 05:30:11 +00:00
Bill Yi
c5a1d40bf1
Import translations. DO NOT MERGE
...
Change-Id: I49725d38064efcb1f95e204a0ab805f8f6eed550
Auto-generated-cl: translation import
2016-10-17 21:10:43 -07:00
Michael Kwan
ff2d91fa07
Merge "Fix oversized icons and removed title line limit." into cw-f-dev
2016-10-17 23:14:06 +00:00
Chris Thornton
c6577b1266
Merge "Update primary key in VIS sound model database." into nyc-mr1-dev
...
am: c81e1f15d2
2016-10-17 22:32:20 +00:00
Chris Thornton
2d452d7dab
Update primary key in VIS sound model database.
...
am: 5bd5cf75e1
2016-10-17 22:32:17 +00:00
TreeHugger Robot
c81e1f15d2
Merge "Update primary key in VIS sound model database." into nyc-mr1-dev
2016-10-17 22:20:38 +00:00
Bill Yi
5a05ce6409
Import translations. DO NOT MERGE
...
Change-Id: I7bd27211cd2cb24cae8bb2bc31404f66e2301f26
Auto-generated-cl: translation import
2016-10-17 14:13:52 -07:00
Bill Yi
00afe024b9
Import translations. DO NOT MERGE
...
Change-Id: Ia35c346101f62955ae7bc9937f02242dad195b9d
Auto-generated-cl: translation import
2016-10-17 14:02:57 -07:00
Matthew Bouyack
2cfae5a656
Merge "DO NOT MERGE Improved anti-aliasing for circular display mask" into cw-f-dev
2016-10-17 20:28:55 +00:00
Chris Craik
a6bfd8d12c
Fix complex clipping on mergeable ops DO NOT MERGE
...
am: d183e0b988
2016-10-17 19:52:53 +00:00
Bill Yi
c11e301ca4
Import translations. DO NOT MERGE
...
Change-Id: I8ed7b626ec4169f9154a18daffe36160b8f3dacb
Auto-generated-cl: translation import
2016-10-17 11:08:03 -07:00
Chris Craik
d183e0b988
Fix complex clipping on mergeable ops DO NOT MERGE
...
Fixes: 32106003
Change-Id: I519bc38a1fa8c25c9ae317ffdb7e59e5a0824f59
2016-10-17 10:51:11 -07:00
Chris Thornton
5bd5cf75e1
Update primary key in VIS sound model database.
...
The public API for getting at KeyphraseSoundModels is based on the user,
locale, and keyphrase ID. However, the sound model database would allow
multiple models to be registered using the same values, as it has a
primary key on the model UUID. This can potentially lead to a scenario
where multiple models are enrolled for the same user, and the data that
is returned when querying models is arbitrary.
V6 of the sound model database now enforces a primary key over the user
ID, locale and keyphrase ID. When inserting a new model with the same
primary key, the old model will be removed and the new model will be
used instead.
When upgrading from V5 to V6, if there are any models that would violate
the primary key constraint, they are all dropped.
Bug: 32174118
Change-Id: I9597c6a994f01a426625c3be2c53e826f26f5156
2016-10-17 10:12:04 -07:00
Jakub Adamek
4a6e246671
Search for RRO in Java both in SKU subdir and in vendor/overlay
...
Currently, if the "ro.boot.vendor.overlay.subdir" property is set, we
only search in the subdir. It seems more powerful to search both in
there and in the standard /vendor/overlay directory.
Also, RRO packages have the "priority" attribute in the <overlay>
attribute in AndroidManifest.xml which serves for disambiguation.
Bug: 32202741
Change-Id: I9ef44b8ca4ac0e92ba02e25b3672c6b274fe4639
2016-10-17 15:52:47 +01:00
Donghyun Cho
040bdab806
Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev
...
am: c00a6cb9c3
2016-10-16 03:17:30 +00:00
Donghyun Cho
02d3fff62d
CEC: Check standby action availability before request for sleep mode
...
am: 02920a08e1
2016-10-16 03:17:26 +00:00
Donghyun Cho
c00a6cb9c3
Merge "CEC: Check standby action availability before request for sleep mode" into nyc-mr1-dev
2016-10-16 03:09:23 +00:00
Sooraj Sasindran
29550c9297
Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev
...
am: 742b0a7d12
2016-10-15 06:38:50 +00:00
Sooraj Sasindran
67987da1af
Introduce the config to disable LAUNCH_BROWSER
...
am: c80aaa94c6
2016-10-15 06:38:42 +00:00
Sooraj Sasindran
742b0a7d12
Merge "Introduce the config to disable LAUNCH_BROWSER" into nyc-mr1-dev
2016-10-15 06:34:05 +00:00
Suprabh Shukla
8345c92ce2
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161 am: eb8bdd6e12 -s ours am: 01e42cf67c am: f0edbfbe48
...
am: 70508a1961
2016-10-15 04:15:21 +00:00
Suprabh Shukla
5c9c67ae08
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62 am: c0a7561135 -s ours am: c0294c50e2 am: 3b38e7d663
...
am: a32f3dfe80
2016-10-15 04:14:17 +00:00
Suprabh Shukla
8df3951fb5
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0 -s ours am: 40a13c5917 am: 0645127e25 -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158 am: 6b903b9299 -s ours am: ef6363cec7 am: f2a0598b8d
...
am: 1051f0b8ad
2016-10-15 04:13:24 +00:00
Suprabh Shukla
6dd160d67b
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2 -s ours am: 8d124e37f1 am: 56b525a313 -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2 am: 128ccbca9a -s ours am: 18cfcf8c8a am: 804c9dee98
...
am: f5eb312a0d
2016-10-15 04:12:19 +00:00
Christopher Tate
68fa1c625f
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07 -s ours am: 690f73f1a1 am: bba4dc9556
...
am: 9686489598
2016-10-15 04:11:22 +00:00
Suprabh Shukla
70508a1961
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161 am: eb8bdd6e12 -s ours am: 01e42cf67c
...
am: f0edbfbe48
2016-10-15 01:58:27 +00:00
Suprabh Shukla
a32f3dfe80
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62 am: c0a7561135 -s ours am: c0294c50e2
...
am: 3b38e7d663
2016-10-15 01:57:25 +00:00
Suprabh Shukla
f0edbfbe48
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161 am: eb8bdd6e12 -s ours
...
am: 01e42cf67c
2016-10-15 01:50:08 +00:00
Suprabh Shukla
3b38e7d663
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62 am: c0a7561135 -s ours
...
am: c0294c50e2
2016-10-15 01:49:09 +00:00
Suprabh Shukla
01e42cf67c
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f am: 13fdd92274 am: cc63841161
...
am: eb8bdd6e12
2016-10-15 01:41:54 +00:00
Suprabh Shukla
c0294c50e2
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4 am: f6c384c657 am: a2fe1c2e62
...
am: c0a7561135
2016-10-15 01:40:55 +00:00
Suprabh Shukla
eb8bdd6e12
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f am: 13fdd92274
...
am: cc63841161
2016-10-15 01:34:14 +00:00
Suprabh Shukla
c0a7561135
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4 am: f6c384c657
...
am: a2fe1c2e62
2016-10-15 01:33:19 +00:00
Suprabh Shukla
1051f0b8ad
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0 -s ours am: 40a13c5917 am: 0645127e25 -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158 am: 6b903b9299 -s ours am: ef6363cec7
...
am: f2a0598b8d
2016-10-15 01:27:23 +00:00
Suprabh Shukla
cc63841161
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours am: 5d1bfd9d5f
...
am: 13fdd92274
2016-10-15 01:26:36 +00:00
Suprabh Shukla
f5eb312a0d
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2 -s ours am: 8d124e37f1 am: 56b525a313 -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2 am: 128ccbca9a -s ours am: 18cfcf8c8a
...
am: 804c9dee98
2016-10-15 01:26:16 +00:00
Suprabh Shukla
a2fe1c2e62
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours am: 99f8b9c2b4
...
am: f6c384c657
2016-10-15 01:25:36 +00:00
Christopher Tate
9686489598
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07 -s ours am: 690f73f1a1
...
am: bba4dc9556
2016-10-15 01:25:22 +00:00
Suprabh Shukla
13fdd92274
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2 am: 6d7f209964 -s ours
...
am: 5d1bfd9d5f
2016-10-15 01:22:13 +00:00
Suprabh Shukla
f2a0598b8d
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into lmp-dev am: 35bd0fc5f0 -s ours am: 40a13c5917 am: 0645127e25 -s ours am: 3da33f8bb0 am: efbb0d6db3 am: b2467b6158 am: 6b903b9299 -s ours
...
am: ef6363cec7
2016-10-15 01:20:32 +00:00
Suprabh Shukla
804c9dee98
DO NOT MERGE Isolated processes don't get precached system service binders am: 4779ee70a2 -s ours am: 8d124e37f1 am: 56b525a313 -s ours am: 250e86a01d am: b8a7dcde9b am: 9755a217a2 am: 128ccbca9a -s ours
...
am: 18cfcf8c8a
2016-10-15 01:19:41 +00:00
Christopher Tate
bba4dc9556
DO NOT MERGE Isolated processes don't get precached system service binders am: 190e66685f am: eafeb8becf -s ours am: 1d86a376c8 am: f2e19dd663 am: 5a4af6ab3a am: 851fd50a07 -s ours
...
am: 690f73f1a1
2016-10-15 01:18:37 +00:00
Suprabh Shukla
5d1bfd9d5f
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into klp-dev am: 6739ba0280 am: c36913e68a am: e3c0c509ea -s ours am: 5bea7d3aee -s ours am: 0eef6b3ff2
...
am: 6d7f209964
2016-10-15 01:18:24 +00:00
Suprabh Shukla
f6c384c657
DO NOT MERGE Isolated processes don't get precached system service binders am: 2aa7e5e861 am: 9df66924c0 am: e07b811d78 -s ours am: 9c78d0ad9f -s ours am: 7dfd05f0e5 am: 2432cf3645 -s ours
...
am: 99f8b9c2b4
2016-10-15 01:18:22 +00:00
Christopher Tate
ef2a9e6191
Merge "DO NOT MERGE Isolated processes don't get precached system service binders" into mnc-dev am: 7b685d4c39 am: ea75bae8c8 am: 3fa004554c am: 8169e87f25 -s ours am: a026501af8 am: e3b8d697cc
...
am: 6609a190f2
2016-10-15 01:14:52 +00:00
