OSDN Git Service
Bill Yi [Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am:
4122130005 -s ours
Change-Id: I2688851beb78619270d8cb6dc077992b9cec037d
Bill Yi [Fri, 19 Aug 2016 15:35:08 +0000 (15:35 +0000)]
Import translations. DO NOT MERGE
am:
3f12495742 -s ours
Change-Id: If2153aa4692097ba2cdee319e3d77d1043dfe7c9
TreeHugger Robot [Fri, 19 Aug 2016 15:28:48 +0000 (15:28 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev
Tyler Gunn [Fri, 19 Aug 2016 14:38:25 +0000 (14:38 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev am:
9df655a443
am:
542511a577
Change-Id: I80a5d6889a844d69efc3bd58494bd127e65a8fc8
Tyler Gunn [Fri, 19 Aug 2016 14:37:50 +0000 (14:37 +0000)]
Add connection events for indicated when a connection is remotely held. am:
b5ed860de7
am:
536e3805bb
Change-Id: I0a70cc83d5c59b8099555bca8babe26163e8da08
Tyler Gunn [Fri, 19 Aug 2016 14:32:21 +0000 (14:32 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
am:
9df655a443
Change-Id: Iaa5962749f2c3695c145af84c52a0389a8a0f906
Tyler Gunn [Fri, 19 Aug 2016 14:32:16 +0000 (14:32 +0000)]
Add connection events for indicated when a connection is remotely held.
am:
b5ed860de7
Change-Id: I0ff4ec175ae9c316ba9a31ad225a84248301f252
Tyler Gunn [Fri, 19 Aug 2016 14:28:06 +0000 (14:28 +0000)]
Merge "Add connection events for indicated when a connection is remotely held." into nyc-mr1-dev
Scott Main [Fri, 19 Aug 2016 13:58:59 +0000 (13:58 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0 am:
c4fb0012e1
am:
be3e7cf89e
Change-Id: I9ea973e58a3111133c0fd83890c3403a0847c9d6
smain@google.com [Fri, 19 Aug 2016 13:58:53 +0000 (13:58 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69 am:
97fd094458
am:
af76b974ae
Change-Id: I495795d568807251efec04097fcf00264bb6707c
Narayan Kamath [Fri, 19 Aug 2016 13:58:48 +0000 (13:58 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248 am:
e3cb8a7db9
am:
957e52bc40
Change-Id: If8772884a3109491036fc1858dc3d0a667197e2f
Narayan Kamath [Fri, 19 Aug 2016 13:58:44 +0000 (13:58 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da am:
b060316945
am:
352f745c5d
Change-Id: Ifff280557880ed487bfaddd3c570af95288d580c
Scott Main [Fri, 19 Aug 2016 13:42:14 +0000 (13:42 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9 am:
97d6427ab0
am:
c4fb0012e1
Change-Id: I2c313260cb95acc8ef7fc1a416ede9faaf29a938
smain@google.com [Fri, 19 Aug 2016 13:42:12 +0000 (13:42 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9 am:
3872e56f69
am:
97fd094458
Change-Id: I55bd31ed3d9b4ce98058ef2478a38cf511b5b85d
Narayan Kamath [Fri, 19 Aug 2016 13:42:09 +0000 (13:42 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
b8f0cd0248
am:
e3cb8a7db9
Change-Id: Iadb326b237e0ff2e23805d46b0331266d81f52f5
Narayan Kamath [Fri, 19 Aug 2016 13:42:07 +0000 (13:42 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
99f960f7da
am:
b060316945
Change-Id: I44662f76bc72770c7c52800933e4423811c76aa9
Christopher Tate [Fri, 19 Aug 2016 13:34:12 +0000 (13:34 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev am:
1b58e1c821
am:
342b16c6db
Change-Id: Id65c140614ca82c97c0268f26e84faf508a4eb3f
Christopher Tate [Fri, 19 Aug 2016 13:34:08 +0000 (13:34 +0000)]
Isolated processes don't get precached system service binders am:
2c61c57ac5
am:
bf3d892df2
Change-Id: I4d7c7376bb28c28ecbc15845179a546c5b1ddd93
Scott Main [Fri, 19 Aug 2016 13:29:14 +0000 (13:29 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
97d6427ab0
Change-Id: Ic8a4e3c86fed503333e6f46d62ad4fd492430547
smain@google.com [Fri, 19 Aug 2016 13:29:12 +0000 (13:29 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
3872e56f69
Change-Id: I19e1cb6e9f79edb9755afb66cce4a67db9428f7f
Narayan Kamath [Fri, 19 Aug 2016 13:29:10 +0000 (13:29 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
b8f0cd0248
Change-Id: I49cd6679da56f5f853c17c741064db88431ded8c
Narayan Kamath [Fri, 19 Aug 2016 13:29:07 +0000 (13:29 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
99f960f7da
Change-Id: I471c81919cce6725433895c3d20ca22a8e827b98
Svetoslav Ganov [Fri, 19 Aug 2016 13:28:48 +0000 (13:28 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev am:
9a6008a334
am:
de63b40374
Change-Id: Ib9fe0ee2efdb9271e7a3a7d551d1e141438f192b
Svet Ganov [Fri, 19 Aug 2016 13:28:13 +0000 (13:28 +0000)]
Add resource based mechanism to grant default permissions am:
59020bffb7
am:
34d85c6087
Change-Id: I1352cc49818be356321970533613741e1c3083b1
Todd Kennedy [Fri, 19 Aug 2016 13:27:42 +0000 (13:27 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev am:
42b14329f5
am:
d8f1599a6a
Change-Id: I9258c68915922344d5067ca1131441d19511c51a
Todd Kennedy [Fri, 19 Aug 2016 13:26:43 +0000 (13:26 +0000)]
Release mPackages lock earlier am:
a8d4f48997
am:
d8443b77cc
Change-Id: I26a23f47407dcb4d50fbfd9b70c1c023c36862a6
Christopher Tate [Fri, 19 Aug 2016 13:18:07 +0000 (13:18 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev
am:
1b58e1c821
Change-Id: If350a2fe5b82301f33c5bf16ccd55f3e487c38f7
Christopher Tate [Fri, 19 Aug 2016 13:18:03 +0000 (13:18 +0000)]
Isolated processes don't get precached system service binders
am:
2c61c57ac5
Change-Id: I1902e0b4401d78a5870c36ba48086819910d55ff
Svetoslav Ganov [Fri, 19 Aug 2016 13:17:59 +0000 (13:17 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
am:
9a6008a334
Change-Id: I6391719f2c978d508c8cd5e29c1d2c9cb173f3d7
Svet Ganov [Fri, 19 Aug 2016 13:17:57 +0000 (13:17 +0000)]
Add resource based mechanism to grant default permissions
am:
59020bffb7
Change-Id: I34d675b7f2ef4fb439bb582c6b36cb00de16acd8
Todd Kennedy [Fri, 19 Aug 2016 13:17:54 +0000 (13:17 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
am:
42b14329f5
Change-Id: I7b6b45115d3ccdf4646395a59c6c572c22b70103
Todd Kennedy [Fri, 19 Aug 2016 13:17:51 +0000 (13:17 +0000)]
Release mPackages lock earlier
am:
a8d4f48997
Change-Id: I4c6a560fed34887eb67db728b4497b28931ae905
Bill Yi [Fri, 19 Aug 2016 05:59:03 +0000 (22:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6f508568c01e18b729b1e3158c625684c6ffc1d1
Auto-generated-cl: translation import
Scott Main [Fri, 19 Aug 2016 01:18:51 +0000 (01:18 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev am:
66ffbbfdf9
am:
6e10a6c034
Change-Id: I13a891f0d36eb885dada3e0b52839a4f26255cd7
smain@google.com [Fri, 19 Aug 2016 01:18:49 +0000 (01:18 +0000)]
fix redirect for AIDL doc bug:
5967288 am:
9ad944f8c9
am:
a4b2c2889b
Change-Id: Ib860989f17257b6bf7bc440543a01cf00ef37afa
Scott Main [Fri, 19 Aug 2016 01:12:12 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: I9d9abedcd5721adbcfa4307794721a448bec80d4
Scott Main [Fri, 19 Aug 2016 01:12:09 +0000 (01:12 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
am:
66ffbbfdf9
Change-Id: Ib72ec2497e7b58c42ecca05cc318d7345e9fce69
smain@google.com [Fri, 19 Aug 2016 01:12:08 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I5a8bc81c442f54cce2a3b02e0a39e62a87f2d0d9
smain@google.com [Fri, 19 Aug 2016 01:12:05 +0000 (01:12 +0000)]
fix redirect for AIDL doc bug:
5967288
am:
9ad944f8c9
Change-Id: I8614af80ea19a68d078ea578d2f8e7a3286f930a
Scott Main [Fri, 19 Aug 2016 01:04:01 +0000 (01:04 +0000)]
Merge "fix redirect for AIDL doc bug:
5967288" into nyc-dev
TreeHugger Robot [Fri, 19 Aug 2016 00:29:34 +0000 (00:29 +0000)]
Merge "Isolated processes don't get precached system service binders" into nyc-mr1-dev
Svetoslav Ganov [Thu, 18 Aug 2016 23:38:32 +0000 (23:38 +0000)]
Merge "Add resource based mechanism to grant default permissions" into nyc-mr1-dev
TreeHugger Robot [Thu, 18 Aug 2016 23:16:01 +0000 (23:16 +0000)]
Merge "Release mPackages lock earlier" into nyc-mr1-dev
Narayan Kamath [Thu, 18 Aug 2016 23:08:51 +0000 (23:08 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I9e945b2a660d5daf57d7c51e8e7c9d814e78a728
Narayan Kamath [Thu, 18 Aug 2016 23:08:49 +0000 (23:08 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I530a1f04545a796d22ca59141aa8fe3de349388c
Ajay Panicker [Thu, 18 Aug 2016 22:42:18 +0000 (22:42 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68 am:
779a1f096c
am:
2bad652e56
Change-Id: I342864675beb5083d67c3d74993995936a9af326
George Mount [Thu, 18 Aug 2016 22:37:25 +0000 (22:37 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev am:
2613fb543a
am:
a1006363d2
Change-Id: I6f530895662f5e39a4fffb932c4139de54fd5b59
George Mount [Thu, 18 Aug 2016 22:37:21 +0000 (22:37 +0000)]
Fix NPE during Activity transition using wrong Activity. am:
a3edbf6a5d
am:
34abaebd3b
Change-Id: Ia21fab56d6ca3767d270e5336334dfb1e066bf5f
Andy Hung [Thu, 18 Aug 2016 22:37:16 +0000 (22:37 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev am:
47c7a8c19a
am:
4b1d87eca6
Change-Id: Ia89aa1418f704935ac2364462634070ffab80e25
Andy Hung [Thu, 18 Aug 2016 22:37:12 +0000 (22:37 +0000)]
AudioSystem: Verify audio port array information am:
737d9fb181
am:
79d51bf46e
Change-Id: Ie74dc2cc9e8f8f9fca143f7cb83acec2b8af669b
Ajay Panicker [Thu, 18 Aug 2016 22:37:06 +0000 (22:37 +0000)]
Merge "Protect various Bluetooth broadcasts" am:
53ff75bb68
am:
779a1f096c
Change-Id: I979b7fcabc7e1f4714a88a632d3590304e1fb4fb
George Mount [Thu, 18 Aug 2016 22:32:14 +0000 (22:32 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
am:
2613fb543a
Change-Id: I82e061d321a935aed4ec9334b51c16d713991d67
Ajay Panicker [Thu, 18 Aug 2016 22:32:09 +0000 (22:32 +0000)]
Merge "Protect various Bluetooth broadcasts"
am:
53ff75bb68
Change-Id: Id4f77ea2092f9a04397fe596ed92f2f30a3235df
George Mount [Thu, 18 Aug 2016 22:32:08 +0000 (22:32 +0000)]
Fix NPE during Activity transition using wrong Activity.
am:
a3edbf6a5d
Change-Id: Ie6ca8f9f9f251eaf844f842e0f6f0ab36a975c1e
Andy Hung [Thu, 18 Aug 2016 22:32:00 +0000 (22:32 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
am:
47c7a8c19a
Change-Id: I8cb76567c8de112d4ac11fbdeaf8880b7ec7c7f9
Andy Hung [Thu, 18 Aug 2016 22:31:53 +0000 (22:31 +0000)]
AudioSystem: Verify audio port array information
am:
737d9fb181
Change-Id: I7a9eeeac4e0f02b4e045b7f277666bd4d3866441
George Mount [Thu, 18 Aug 2016 22:27:27 +0000 (22:27 +0000)]
Merge "Fix NPE during Activity transition using wrong Activity." into nyc-mr1-dev
Treehugger Robot [Thu, 18 Aug 2016 22:25:39 +0000 (22:25 +0000)]
Merge "Protect various Bluetooth broadcasts"
Andy Hung [Thu, 18 Aug 2016 22:25:17 +0000 (22:25 +0000)]
Merge "AudioSystem: Verify audio port array information" into nyc-mr1-dev
smain@google.com [Thu, 18 Aug 2016 21:41:47 +0000 (14:41 -0700)]
fix redirect for AIDL doc
bug:
5967288
Change-Id: Ia2a4cbdde56d2e6baca4c5f74ea92bb7bfaf2938
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
(cherry picked from commit
9a236066dbf604edfd5f873b4a3b94a200efd628)
Tim Murray [Thu, 18 Aug 2016 20:41:01 +0000 (20:41 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev am:
bb4e37c602
am:
6e23e43d54
Change-Id: Ibe675c0aebe95273ff12e2833b6668e0d3bc4bfa
Tim Murray [Thu, 18 Aug 2016 20:35:12 +0000 (20:35 +0000)]
Prevent FIFO threads from creating more FIFO threads. am:
38ee337f45
am:
0ceda0c956
Change-Id: I71d40b4e0a8716cf1c1af5339de31d7edf744e43
Tim Murray [Thu, 18 Aug 2016 20:31:00 +0000 (20:31 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
am:
bb4e37c602
Change-Id: Iea2f53fb8a62d3c59a10ca352a8485cd4d0ee326
Tim Murray [Thu, 18 Aug 2016 20:30:58 +0000 (20:30 +0000)]
Prevent FIFO threads from creating more FIFO threads.
am:
38ee337f45
Change-Id: Iecd7619faae5195934335afc0048cc5ddb6b9ab7
Tim Murray [Thu, 18 Aug 2016 20:25:36 +0000 (20:25 +0000)]
Merge "Prevent FIFO threads from creating more FIFO threads." into nyc-mr1-dev
Svet Ganov [Thu, 18 Aug 2016 19:32:35 +0000 (12:32 -0700)]
Add resource based mechanism to grant default permissions
This CL adds a mechanism for an OEM to grant default permissions
using the build system. This allows permissions for which they
got default grant exceptions to be added without modifying the
platform code. The format is a simple XML listing the packages
and the permissions to be granted for a package. The XML file
is placed in etc/default-permissions.
bug:
29546655
bug:
30929033
Change-Id: Ifb0516d7e2d0b399532024438bc0f86068a2e4e2
Svetoslav Ganov [Thu, 18 Aug 2016 19:22:28 +0000 (19:22 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev am:
6642c963d9
am:
decad179f6
Change-Id: Ie4c013991ea3a57009926973441adcbeec38d56f
Svet Ganov [Thu, 18 Aug 2016 19:22:24 +0000 (19:22 +0000)]
Grab lock when accessing mutable state am:
442ed57e4b
am:
e1790d928f
Change-Id: If7d7e4f80f01b112d7a24993d28746c71ec85a17
Svetoslav Ganov [Thu, 18 Aug 2016 19:12:54 +0000 (19:12 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
am:
6642c963d9
Change-Id: Ibe00e1f3bdf916129355a38beece5378ec379a78
Svet Ganov [Thu, 18 Aug 2016 19:12:50 +0000 (19:12 +0000)]
Grab lock when accessing mutable state
am:
442ed57e4b
Change-Id: Ic8610ed5f0584150d7cda88761bff69dca8d1b42
Svetoslav Ganov [Thu, 18 Aug 2016 19:05:47 +0000 (19:05 +0000)]
Merge "Grab lock when accessing mutable state" into nyc-mr1-dev
Ajay Panicker [Thu, 18 Aug 2016 18:46:50 +0000 (18:46 +0000)]
Protect various Bluetooth broadcasts am:
9a236066db
am:
003342e425
Change-Id: I854cce48aee3ec723ed520dd40af068d0907e11a
Ajay Panicker [Thu, 18 Aug 2016 18:40:25 +0000 (18:40 +0000)]
Protect various Bluetooth broadcasts
am:
9a236066db
Change-Id: I71a84c8486b70d6b94e9656a8a1299a9796d0d52
Todd Kennedy [Thu, 18 Aug 2016 18:22:52 +0000 (11:22 -0700)]
Release mPackages lock earlier
We cannot hold mPackages when calling into generatePackageDexopts().
This method takes Package Manager's mInstallLock. By holding mPackages,
we have lock inversion and hilarity ensues.
Change-Id: Ia11a158677051e3511702f38cde6780e75b256fb
Fixes:
30927731
Tim Murray [Thu, 18 Aug 2016 18:13:26 +0000 (11:13 -0700)]
Prevent FIFO threads from creating more FIFO threads.
SCHED_FIFO threads shouldn't be able to arbitrarily create more
SCHED_FIFO threads.
bug
30898724
Change-Id: I3704b47b88b573313e9b1610556648c8595d4108
Christopher Tate [Tue, 16 Aug 2016 23:03:44 +0000 (16:03 -0700)]
Isolated processes don't get precached system service binders
More specifically, they get a PackageManager binder -- necessary for
Android process startup and configuration -- but none of the other
usual preloaded service binders.
Bug
30202228
Change-Id: I3810649f504cd631665ece338a83d2e54d41ad05
George Mount [Tue, 16 Aug 2016 20:10:19 +0000 (13:10 -0700)]
Fix NPE during Activity transition using wrong Activity.
Bug
30786309
If the Activity used in makeSceneTransitionAnimation isn't
the same one used in the startActivity call, a NullPointerException
could be thrown.
Change-Id: Id21c54fcf99b353feab62f7fc160997ed06e7d23
(cherry picked from commit
3289bfa289f560d60611dddef9441c9614fd883a)
Ajay Panicker [Wed, 17 Aug 2016 22:36:24 +0000 (15:36 -0700)]
Protect various Bluetooth broadcasts
Bug:
30832954
Change-Id: I37e0b2ffab65c0703244917a4ade9bb8afbb5e6f
Narayan Kamath [Thu, 18 Aug 2016 10:33:08 +0000 (10:33 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a am:
e24a4590bf
am:
9988387315
Change-Id: I3d231654ed3c6264087f5b3a953f5e27d2c3d5ed
Narayan Kamath [Thu, 18 Aug 2016 10:32:57 +0000 (10:32 +0000)]
Process: Fix communication with zygote. am:
448be0a622 am:
ac16712d8a
am:
b9871c0dd3
Change-Id: I1fefed1f81ed0033ababf0847923a689a3ee4b5c
Narayan Kamath [Thu, 18 Aug 2016 10:25:56 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
480f4a932e
Change-Id: Ibf3184b0e02c5b77d1fec5d8c2e2bcefe7100c3d
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev am:
cce8af824a
am:
e24a4590bf
Change-Id: I933fe1f6f191e669a7a6ed4d00660a01f95feade
Narayan Kamath [Thu, 18 Aug 2016 10:25:53 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
6bc7670c67
Change-Id: I37ea2a3324277340fce69fcc6a5101bee0637dca
Narayan Kamath [Thu, 18 Aug 2016 10:25:51 +0000 (10:25 +0000)]
Process: Fix communication with zygote. am:
448be0a622
am:
ac16712d8a
Change-Id: Ief10a90dc77fa8e5cd562a39a6ddbad059353fdf
Narayan Kamath [Thu, 18 Aug 2016 10:20:01 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I728529bd6e54b7e1e220b62f6c84dc5e868d5ecc
Narayan Kamath [Thu, 18 Aug 2016 10:20:00 +0000 (10:20 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
am:
cce8af824a
Change-Id: I1086785cde9f5d9bbdff84b225c4d20582977c75
Narayan Kamath [Thu, 18 Aug 2016 10:19:58 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: Iabb68084827f798f25ebe870957074d152acaea4
Narayan Kamath [Thu, 18 Aug 2016 10:19:57 +0000 (10:19 +0000)]
Process: Fix communication with zygote.
am:
448be0a622
Change-Id: I5d496613f53c339c75a3293845670d9d8360c90f
Narayan Kamath [Thu, 18 Aug 2016 10:14:29 +0000 (10:14 +0000)]
Merge "Process: Fix communication with zygote." into nyc-dev
Dmitriy Filchenko [Thu, 18 Aug 2016 03:33:20 +0000 (03:33 +0000)]
Merge "Remove unused includes." am:
35da832634 am:
33e65232f3
am:
eb349448aa
Change-Id: Ib07d472af12852399a80d5a6503c1c34a6c9380c
Dmitriy Filchenko [Thu, 18 Aug 2016 03:27:54 +0000 (03:27 +0000)]
Merge "Remove unused includes." am:
35da832634
am:
33e65232f3
Change-Id: I72e74566ed21f4aed4b2d6b4fa6e7ac1114a9f43
Dmitriy Filchenko [Thu, 18 Aug 2016 03:22:39 +0000 (03:22 +0000)]
Merge "Remove unused includes."
am:
35da832634
Change-Id: I5804c0ccf6c543471ddf3245a799d5fa651d6d18
Treehugger Robot [Thu, 18 Aug 2016 03:17:04 +0000 (03:17 +0000)]
Merge "Remove unused includes."
Dmitriy Filchenko [Thu, 18 Aug 2016 00:55:24 +0000 (17:55 -0700)]
Remove unused includes.
BUG:
29824203
Change-Id: I795f8abe31575f70da263921c6ec13b73b24dc7b
Bill Yi [Thu, 18 Aug 2016 01:32:21 +0000 (01:32 +0000)]
Import translations. DO NOT MERGE am:
9d652db6a4 -s ours
am:
b024dd7501 -s ours
Change-Id: Id17a8898db1aaf4230d66d062884d0ac4b5d391f
Adam Lesinski [Thu, 18 Aug 2016 01:32:06 +0000 (01:32 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
6d90bbbc6c
Change-Id: I11da4168a11265690e27c00498f94eac363e4b64
Bill Yi [Thu, 18 Aug 2016 01:28:19 +0000 (01:28 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
4b30053ede -s ours
Change-Id: I28c7df17b56064d5d267de60a0821ebd409b910b
Bill Yi [Thu, 18 Aug 2016 01:28:18 +0000 (01:28 +0000)]
Import translations. DO NOT MERGE
am:
9d652db6a4 -s ours
Change-Id: If56739a9258c72a95dd7be524dd3b5c21bfd34ed
Adam Lesinski [Thu, 18 Aug 2016 01:27:52 +0000 (01:27 +0000)]
Merge "AppIdleHistory: Only write screen on durations during regular sync" into nyc-mr1-dev am:
1af694510d
am:
65a12c15e7
Change-Id: Ide64632d5351a5405f6ab98c09f16311fe71c821