Daniel Rosenberg
d38e3c522c
Add nofail fstab option
...
This option allows fs_mgr to ignore mount errors on an optional
partition to allow booting to continue.
Bug: 28071890
Change-Id: I71a2b3c1c573297cab18884b4c4bd7c27ced2901
2016-04-07 20:37:31 -07:00
Josh Gao
9bf0b815ad
Don\'t demangle symbol names. am: fbbc744
...
am: 0edda64
* commit '0edda648fb7793c58ff76ceb0c740571b25d16fd':
Don't demangle symbol names.
2016-03-23 20:44:20 +00:00
Josh Gao
0edda648fb
Don\'t demangle symbol names.
...
am: fbbc744
* commit 'fbbc744130c85538a754d245e958d7d79f24309c':
Don't demangle symbol names.
2016-03-23 20:40:48 +00:00
Josh Gao
83317d5d74
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours am: af857f6
am: 44e6cff
...
am: 7e7a1fb
* commit '7e7a1fb6e84b381914b0e315183d2b283c475ea6':
Don't demangle symbol names.
2016-03-23 18:46:41 +00:00
Josh Gao
fbbc744130
Don't demangle symbol names.
...
Bug: http://b/27299236
Change-Id: I26ef47f80d4d6048a316ba51e83365ff65d70439
2016-03-23 11:43:35 -07:00
Josh Gao
7e7a1fb6e8
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours am: af857f6
...
am: 44e6cff
* commit '44e6cff67ff0902dba5d833805b8902f21597a7f':
Don't demangle symbol names.
2016-03-23 18:42:46 +00:00
Josh Gao
44e6cff67f
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
am: 53cacfa
-s ours
...
am: af857f6
* commit 'af857f6dc8e103d9cd1c6b40c664fb9f65b426ec':
Don't demangle symbol names.
2016-03-23 18:38:52 +00:00
Josh Gao
af857f6dc8
Merge "Don\'t demangle symbol names." into lmp-dev am: 6914799
...
am: 53cacfa
-s ours
* commit '53cacfa3037ef75b783d72307177a215fc02f070':
Don't demangle symbol names.
2016-03-23 18:34:53 +00:00
Josh Gao
53cacfa303
Merge "Don\'t demangle symbol names." into lmp-dev
...
am: 6914799
* commit '69147994ba50146e1f9c7d98136429057627b4bd':
Don't demangle symbol names.
2016-03-23 18:23:06 +00:00
Josh Gao
69147994ba
Merge "Don't demangle symbol names." into lmp-dev
2016-03-23 18:13:20 +00:00
Josh Gao
e144c6fedc
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
am: 69a29d1
-s ours am: fa7bff7
...
am: fe523b9
* commit 'fe523b9bab3fa9e46fdf1210e05003bd3c919437':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:14:09 +00:00
Josh Gao
fe523b9bab
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
am: 69a29d1
-s ours
...
am: fa7bff7
* commit 'fa7bff765bb5b7d595745fd9dbed7daa56d24bb0':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:10:42 +00:00
Josh Gao
fa7bff765b
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours am: 029b787
...
am: 69a29d1
-s ours
* commit '69a29d169a9775b0acb12457e631fdafe1044eb7':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:07:14 +00:00
Josh Gao
69a29d169a
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours am: ba1f9d5
-s ours
...
am: 029b787
* commit '029b7874695c7173d6f3d7bf80ce4d2fc46f6fb4':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 01:03:47 +00:00
Josh Gao
029b787469
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours am: 908c511
-s ours
...
am: ba1f9d5
-s ours
* commit 'ba1f9d50bdcc282b30bca99c2a4111f0d6fad126':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:56:45 +00:00
Josh Gao
ba1f9d50bd
Don\'t demangle symbol names. DO NOT MERGE am: a183654
-s ours
...
am: 908c511
-s ours
* commit '908c511e50c2ed5f69dcafbe82af75d5a090275f':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:53:20 +00:00
Josh Gao
908c511e50
Don\'t demangle symbol names. DO NOT MERGE
...
am: a183654
-s ours
* commit 'a183654b820447e6bd9980413e1f7ff5b89f875b':
Don't demangle symbol names. DO NOT MERGE
2016-03-23 00:49:48 +00:00
Josh Gao
7c903fbacf
Don't demangle symbol names.
...
Bug: http://b/27299236
Change-Id: I3a698c6d93e262fd78e743c1e6e946b054b9dcd1
2016-03-22 11:51:36 -07:00
Josh Gao
a183654b82
Don't demangle symbol names. DO NOT MERGE
...
Bug: http://b/27299236
Change-Id: I80524d8d5df9c5abea8c6db8ded965a5dfa3d607
2016-03-22 11:33:28 -07:00
Josh Gao
77afd98582
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours am: 8a7a944fd3
...
am: aa0afa65c5
* commit 'aa0afa65c573cbc30ed6afb795b27b12a2f29b31':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:21:02 +00:00
Josh Gao
aa0afa65c5
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
am: 512b191d80
-s ours
...
am: 8a7a944fd3
* commit '8a7a944fd399dc7f9475b7cc2e06681516156e39':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:14:53 +00:00
Josh Gao
f25e2dfd3f
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
am: 92e0f8f49d
...
am: 65f7b2d616
* commit '65f7b2d6169a2a61fe1d607ca55e690721faf31a':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:14:05 +00:00
Josh Gao
8a7a944fd3
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours am: 75708e52d3
...
am: 512b191d80
-s ours
* commit '512b191d80f01f514789b33d44b64534708ede51':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
65f7b2d616
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
am: c663d0482b
...
am: 92e0f8f49d
* commit '92e0f8f49d952b365b2be7715a4320d2451d7a67':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 22:06:23 +00:00
Josh Gao
512b191d80
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
am: 9cde309103
-s ours
...
am: 75708e52d3
* commit '75708e52d3cced48b4726e71ac94f17cd013ee98':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:59:29 +00:00
Josh Gao
92e0f8f49d
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
am: b97b07e55b
...
am: c663d0482b
* commit 'c663d0482b67d028e5b30dbe5f45ef7da2b3e5de':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:59:21 +00:00
Josh Gao
c663d0482b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
am: 7e10520392
...
am: b97b07e55b
* commit 'b97b07e55b4ef4312870398bf658b30b41103403':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:52:52 +00:00
Josh Gao
75708e52d3
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours am: 1eb6ec56c2
...
am: 9cde309103
-s ours
* commit '9cde3091033bc367690aa65b814650cdc0e284fe':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:46:12 +00:00
Josh Gao
b97b07e55b
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours am: adc3bcb1d5
...
am: 7e10520392
* commit '7e105203923041986a1bd125d86495663fee3abf':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:37:04 +00:00
Josh Gao
9cde309103
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE am: bdfb431467
-s ours
...
am: 1eb6ec56c2
* commit '1eb6ec56c28aae79dadb62e63e245745fe9485a1':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:36:59 +00:00
Josh Gao
1eb6ec56c2
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE
...
am: bdfb431467
-s ours
* commit 'bdfb43146770f631c7097c378c0dbb8e6f8619a1':
Don't create tombstone directory. DO NOT MERGE
2016-02-24 21:30:37 +00:00
Josh Gao
7e10520392
resolve merge conflicts of 9515c23e16
to klp-modular-dev am: 91b48c3796
-s ours
...
am: adc3bcb1d5
* commit 'adc3bcb1d5e4426273223e0889c7f207abb240f2':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:30:36 +00:00
Josh Gao
adc3bcb1d5
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
am: 91b48c3796
-s ours
* commit '91b48c37962238e3568d6660aeadfcd4d6eb4207':
debuggerd: use O_NOFOLLOW|O_CLOEXEC for tombstones. DO NOT MERGE
2016-02-24 21:23:55 +00:00
Josh Gao
bdfb431467
resolve merge conflicts of 557749e55b
to klp-modular-dev DO NOT MERGE
...
Change-Id: I51653e2ba8e7d1fa345206a4dd8b15f2e29429f2
2016-02-24 13:20:48 -08:00
Nick Kralevich
89c789ae47
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours am: d5cb8b417b
...
am: 77dd50b470
* commit '77dd50b4707b0b2b12d4ca136d8c0529d18eedc1':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 20:57:19 +00:00
Josh Gao
91b48c3796
resolve merge conflicts of 9515c23e16
to klp-modular-dev
...
Change-Id: I4b39875ce57bb1ea55898db3ffc004a491bbeaa4
2016-02-24 12:08:28 -08:00
Nick Kralevich
77dd50b470
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
am: b760e61686
-s ours
...
am: d5cb8b417b
* commit 'd5cb8b417bd938d9c1ef1262df88ed3d90706301':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:55:37 +00:00
Josh Gao
41f72f0537
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
am: 3ee4a0be2a
...
am: 7f0d750b2d
* commit '7f0d750b2d8907816b3d9b171f2eebda38be6e03':
Don't create tombstone directory.
2016-02-24 19:49:23 +00:00
Nick Kralevich
a03485daa5
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
am: 077a9ffe40
...
am: bf8ace32ef
* commit 'bf8ace32efb4903642b0e372a5fe939685686467':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:49:12 +00:00
Nick Kralevich
d5cb8b417b
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours am: 505a431468
...
am: b760e61686
-s ours
* commit 'b760e61686e592eb268ffe667e6c164b0aa29f47':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:48:55 +00:00
Nick Kralevich
b760e61686
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
am: 75ccd732f3
-s ours
...
am: 505a431468
* commit '505a43146861f5e5f3852b2cb47ff8af54d04b75':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:43:01 +00:00
Josh Gao
7f0d750b2d
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
am: 338f1802ee
...
am: 3ee4a0be2a
* commit '3ee4a0be2ae8b21a2235278c88d40b4feb3ddd08':
Don't create tombstone directory.
2016-02-24 19:37:01 +00:00
Nick Kralevich
bf8ace32ef
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
am: 6d7ce7b14c
...
am: 077a9ffe40
* commit '077a9ffe402c0776328bd5a4e85230bba458dc47':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:36:45 +00:00
Josh Gao
3ee4a0be2a
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
am: 0cf99e2b61
...
am: 338f1802ee
* commit '338f1802ee7d87bb4ea2f3fe9ef1c72e1784188b':
Don't create tombstone directory.
2016-02-24 19:31:16 +00:00
Nick Kralevich
505a431468
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours am: d61ebb0851
...
am: 75ccd732f3
-s ours
* commit '75ccd732f3fef68fc568d96d00a412920798f55c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:31:07 +00:00
Nick Kralevich
077a9ffe40
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
am: 4d4eb0db97
...
am: 6d7ce7b14c
* commit '6d7ce7b14c906eff4488bddb0338a38f57eac1de':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:31:04 +00:00
Josh Gao
338f1802ee
Don\'t create tombstone directory. am: cb9625cbe5
am: 99b8a56616
...
am: 0cf99e2b61
* commit '0cf99e2b618ac5c8a495f607b1978fcd9e3ee827':
Don't create tombstone directory.
2016-02-24 19:25:50 +00:00
Nick Kralevich
75ccd732f3
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
am: c61a896f20
-s ours
...
am: d61ebb0851
* commit 'd61ebb085172200c02af73e030646baf3301028c':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:25:39 +00:00
Nick Kralevich
6d7ce7b14c
ensure /data/tombstones exists on all Android devices am: e2796207ee
am: 9660c6759e
...
am: 4d4eb0db97
* commit '4d4eb0db978bca41727ed21406da42332367de7d':
ensure /data/tombstones exists on all Android devices
2016-02-24 19:25:38 +00:00
Nick Kralevich
d61ebb0851
ensure /data/tombstones exists on all Android device. DO NOT MERGE am: 9c0ed66313
...
am: c61a896f20
-s ours
* commit 'c61a896f2006d76fd3d805ace2282b9590432a67':
ensure /data/tombstones exists on all Android device. DO NOT MERGE
2016-02-24 19:18:41 +00:00