OSDN Git Service
The Android Automerger [Thu, 26 May 2016 07:02:32 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 26 May 2016 01:17:12 +0000 (18:17 -0700)]
"NRD55B"
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev
Adam Powell [Wed, 25 May 2016 23:48:56 +0000 (16:48 -0700)]
N is API 24
Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52
Zach Jang [Wed, 25 May 2016 21:02:20 +0000 (21:02 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83 am:
4af9b20fbd
am:
cf227d4401
* commit '
cf227d440176f5c10b252ff75fdc6aabf7d4829d':
Updating security string to 2016-07-05
Change-Id: Iffcc0c0b77df8d1bbb69bfd69f9ef0818e469c68
Zach Jang [Wed, 25 May 2016 20:57:41 +0000 (20:57 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4 am:
db34ed5f83
am:
4af9b20fbd
* commit '
4af9b20fbd847ffab365a4677de0e9752737c4f3':
Updating security string to 2016-07-05
Change-Id: I9e5d40dc3710efa07a7fa365d99f3bf6d6dc2109
Tianjie Xu [Wed, 25 May 2016 20:57:20 +0000 (20:57 +0000)]
Merge "Report error codes in the OTA update script" into nyc-dev
Zach Jang [Wed, 25 May 2016 20:52:58 +0000 (20:52 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd am:
d5e1f1ee8e
am:
6a974cf124 -s ours
* commit '
6a974cf124727c19496f202576b7520cd22175d1':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I268b1e3d67c2b8cf579c5b88d582ab3b93592aec
Zach Jang [Wed, 25 May 2016 20:52:57 +0000 (20:52 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0 am:
bf5d08ecf4
am:
db34ed5f83
* commit '
db34ed5f83efc646f37eae8ee61233ee2c2e4979':
Updating security string to 2016-07-05
Change-Id: I9fa607cd71960ac309a5a791e8572a7e183a54d0
Zach Jang [Wed, 25 May 2016 20:44:23 +0000 (20:44 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078 am:
2823643ecd
am:
d5e1f1ee8e
* commit '
d5e1f1ee8e3ba4051785fd7bc2b2ec384870a829':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I93652c1e6e3bc3b8a2bd48a50cb8f1dbafac9d59
Zach Jang [Wed, 25 May 2016 20:44:22 +0000 (20:44 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad am:
7cc20fe0a0
am:
bf5d08ecf4
* commit '
bf5d08ecf4cce47611ee58dbe6b0685e04725c87':
Updating security string to 2016-07-05
Change-Id: I7de8ef605de344ceba9e634ea4f7eb127b91fcf7
Zach Jang [Wed, 25 May 2016 20:39:29 +0000 (20:39 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours am:
4c9d484078
am:
2823643ecd
* commit '
2823643ecdbfd8ad700834dd292fa2b827072634':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I1a9612e6c22d631d634cdab47a733e0e22b285a4
Zach Jang [Wed, 25 May 2016 20:39:28 +0000 (20:39 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f am:
e7660e56ad
am:
7cc20fe0a0
* commit '
7cc20fe0a058f3e2e323da12b0d5eb3c5d6311cb':
Updating security string to 2016-07-05
Change-Id: I365f9fb0c5e2a29bbf93ea6476d3d697998b90b3
Zach Jang [Wed, 25 May 2016 20:34:47 +0000 (20:34 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4 am:
afbf826576 -s ours
am:
4c9d484078
* commit '
4c9d484078d45bef09147e5beaf475f9aba96eb4':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: If826c11507df71dc36228d0b5b845078080e37a2
Zach Jang [Wed, 25 May 2016 20:34:46 +0000 (20:34 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev am:
ab6c08949f
am:
e7660e56ad
* commit '
e7660e56ad330c8469857014c448130143c86856':
Updating security string to 2016-07-05
Change-Id: I88edd89acdbdd63433fb595a2c7e7a048cd9cdfe
Zach Jang [Wed, 25 May 2016 20:30:15 +0000 (20:30 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff am:
e496a955f4
am:
afbf826576 -s ours
* commit '
afbf826576540aa15310d018235f90f8cfd6c6fc':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I83310642258499e75c191cc9969da5ffa2d91c3d
Zach Jang [Wed, 25 May 2016 20:30:14 +0000 (20:30 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
am:
ab6c08949f
* commit '
ab6c08949f2a96867b1eda536eeb74982a49d5d3':
Updating security string to 2016-07-05
Change-Id: I2357ba1f5ba742ffdeed1fbcd9359405cbb436d8
Zach Jang [Wed, 25 May 2016 20:25:14 +0000 (20:25 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours am:
1fc50f59ff
am:
e496a955f4
* commit '
e496a955f40fafb3073f7aef8be89c704ce0f01c':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I24dd5be0560f7b6826dfd4700510f2517f1604ff
Zach Jang [Wed, 25 May 2016 20:21:24 +0000 (20:21 +0000)]
Merge "Updating security string to 2016-07-05" into lmp-mr1-dev
Zach Jang [Wed, 25 May 2016 20:20:57 +0000 (20:20 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours am:
79770b1927 -s ours
am:
1fc50f59ff
* commit '
1fc50f59ff732131122d8fbcdbb497561e434364':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I65cc7edc2d2b69fb7d3fc3745dc3662ddb59be63
Zach Jang [Wed, 25 May 2016 20:16:34 +0000 (20:16 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a am:
60270ec785 -s ours
am:
79770b1927 -s ours
* commit '
79770b192771b7e332f1537fef3e3719b07bcf14':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ie757679100cd217973d8371de8a72adc89392bbc
Zach Jang [Wed, 25 May 2016 20:11:54 +0000 (20:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375 am:
555c5af89a
am:
60270ec785 -s ours
* commit '
60270ec78531308f91221ca09c74edee6701ec34':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ia89f4840478991109628844f889e6c97677b0d50
Zach Jang [Wed, 25 May 2016 20:07:30 +0000 (20:07 +0000)]
DO NOT MERGE Updating security string to 2016-07-05 am:
f885e95375
am:
555c5af89a
* commit '
555c5af89a4b25f61ff827431b0081be7b70d5fe':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: I7f662a6d72179678beee82b3cfb87525eae2b2c2
Zach Jang [Wed, 25 May 2016 20:03:05 +0000 (20:03 +0000)]
DO NOT MERGE Updating security string to 2016-07-05
am:
f885e95375
* commit '
f885e95375a48aeefd7d2451a5c61a48100bac77':
DO NOT MERGE Updating security string to 2016-07-05
Change-Id: Ic58e87cd25747728aa105047cf81a32253d4aba4
Zach Jang [Wed, 25 May 2016 19:41:59 +0000 (12:41 -0700)]
DO NOT MERGE Updating security string to 2016-07-05
b/
28912173
Change-Id: I81301d51fd62932005a24178c57a0731566910a6
Zach Jang [Wed, 25 May 2016 19:38:46 +0000 (12:38 -0700)]
Updating security string to 2016-07-05
b/
28912173
Change-Id: I5dafe754c226eeb3f0beb3b23b219df2b82ef372
Tianjie Xu [Wed, 25 May 2016 00:34:52 +0000 (17:34 -0700)]
Report error codes in the OTA update script
Modify the abort() function in the OTA update generation script to
report an error code. The recoveryimage will parse the code and write it
into last_install for further data analysis.
Bug:
28934032
Change-Id: I2d62f81fd352c3102fb84f054972ac0ecb965a21
The Android Automerger [Wed, 25 May 2016 07:07:03 +0000 (00:07 -0700)]
"NRD55"
The Android Automerger [Wed, 25 May 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Nick Kralevich [Wed, 25 May 2016 00:36:23 +0000 (17:36 -0700)]
goldfish_setup: grant /system/bin/sh exec access
The goldfish_setup shell script needs the ability to execute
the shell script interpreter. Allow it.
Addresses the following denial:
avc: denied { getattr } for pid=1220 comm="init.goldfish.s"
path="/system/bin/sh" dev="vda" ino=442 scontext=u:r:goldfish_setup:s0
tcontext=u:object_r:shell_exec:s0 tclass=file permissive=0
Bug:
28941573
Change-Id: I22d26e90f107c8d801229354a5e0513c37e6c31d
The Android Automerger [Tue, 24 May 2016 20:22:02 +0000 (13:22 -0700)]
"NRD54B"
The Android Automerger [Tue, 24 May 2016 07:05:42 +0000 (00:05 -0700)]
"NRD54"
The Android Automerger [Tue, 24 May 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Zach Jang [Tue, 24 May 2016 01:32:29 +0000 (01:32 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd am:
37e618fef8
am:
c3d3f6bad9 -s ours
* commit '
c3d3f6bad9371e7d4b1cdf100b17692e9dc2922e':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I3c573b10baba8ebd7b881b5f5bd4ebb10633a9a9
Zach Jang [Tue, 24 May 2016 01:29:38 +0000 (01:29 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e am:
bc60af7bfd
am:
37e618fef8
* commit '
37e618fef8922f6a5790e2cf83f28ee48c46a213':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ifb8352e7397a3a80ce5041bf74e95c609cc7c754
Zach Jang [Tue, 24 May 2016 01:27:10 +0000 (01:27 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours am:
9ae8c7356e
am:
bc60af7bfd
* commit '
bc60af7bfd4e7190086d59eea53b3dcf3cf40a6d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I4ce025692a6e6c0c96d5657d99131c306a742da4
Zach Jang [Tue, 24 May 2016 01:22:07 +0000 (01:22 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7 am:
8ebaeae1f6 -s ours
am:
9ae8c7356e
* commit '
9ae8c7356efd1eadb9e4043d96cc5dc28ba554b6':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I67fe439474ce9edd47194a926719b71b846a2a56
Zach Jang [Tue, 24 May 2016 01:19:54 +0000 (01:19 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64 am:
608f329e07 am:
2d75d4447c
am:
3ffee87b5c
* commit '
3ffee87b5cd468aa5bf14a3e326aa080948db4f3':
Updating security string to 2016-07-01
Change-Id: Id3468f4dbeb626ad3289f5acef32a72e3e18201b
Zach Jang [Tue, 24 May 2016 01:19:37 +0000 (01:19 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b am:
3cba9b15f7
am:
8ebaeae1f6 -s ours
* commit '
8ebaeae1f6f0a69fc1bf518558fa463ed0cca6de':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I07650552a45e5e2de1524b43839c895283d17c4a
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours am:
8b961c808b
am:
3cba9b15f7
* commit '
3cba9b15f7ce25e194a305d37d27424e6923fd4b':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Ib7e12ebb1a9140084a1e3aa28cede2809499004e
Zach Jang [Tue, 24 May 2016 01:17:01 +0000 (01:17 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64 am:
608f329e07
am:
2d75d4447c
* commit '
2d75d4447ca47666b20fe91e595a3274c8a975cf':
Updating security string to 2016-07-01
Change-Id: I59ad6e51072d854b052873a0ec32d8de2cdf5a1d
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours am:
e495d379de -s ours
am:
8b961c808b
* commit '
8b961c808b6c67d464f4c070ea46b8a0650595d5':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: Id5916f2fa84a2fee99a37a1a8b9fd07d8c58ae0b
Zach Jang [Tue, 24 May 2016 01:14:26 +0000 (01:14 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d am:
3e082f1e64
am:
608f329e07
* commit '
608f329e0718a9ef3ed89b3f9d4768b003bc88de':
Updating security string to 2016-07-01
Change-Id: I93c86db7e020f586784f8a8b106806dbb7874d76
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3 am:
2ee84bf0a5 -s ours
am:
e495d379de -s ours
* commit '
e495d379decdfea93789c4693dd0f96aac23c34d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I1749805100b45f8f12cac476df8e7be3380fbd54
Zach Jang [Tue, 24 May 2016 01:11:45 +0000 (01:11 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78 am:
0b4608ca4d
am:
3e082f1e64
* commit '
3e082f1e649821f00ec751824e901f64a2756269':
Updating security string to 2016-07-01
Change-Id: I5c04b6e42927d45c9bf0e2f842cd9eac8f62dfa5
Zach Jang [Tue, 24 May 2016 01:09:15 +0000 (01:09 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b am:
1dd3095e78
am:
0b4608ca4d
* commit '
0b4608ca4d8b10af335f839350a4224a198e8dee':
Updating security string to 2016-07-01
Change-Id: I08d096476c645d304ab5038cd5ca586073424157
Zach Jang [Tue, 24 May 2016 01:09:14 +0000 (01:09 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01 am:
0bdac8fba3
am:
2ee84bf0a5 -s ours
* commit '
2ee84bf0a56984323154411d60096b691c66b841':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I7a2c2f1d707eb14b56b8e5227724427bdf0e2768
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am:
89f6f7aa01
am:
0bdac8fba3
* commit '
0bdac8fba335f4e1620871bf5082dbebc55a497d':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I9c2b97af248ab4007fbfce8d67f9f70b5016687f
Zach Jang [Tue, 24 May 2016 01:06:37 +0000 (01:06 +0000)]
Updating security string to 2016-07-01 am:
45ff24a04b
am:
1dd3095e78
* commit '
1dd3095e780dc83aa1b4056f298a4678bead075a':
Updating security string to 2016-07-01
Change-Id: Id2e67d174cc1c79cbc418089aa7870ff38102a08
Zach Jang [Tue, 24 May 2016 01:02:06 +0000 (01:02 +0000)]
Updating security string to 2016-07-01
am:
45ff24a04b
* commit '
45ff24a04bd5d3af706ae3aa6266106560070a3d':
Updating security string to 2016-07-01
Change-Id: I426da21a6ba7c2e62a7f57765c0c35063d151ad4
Zach Jang [Tue, 24 May 2016 01:02:05 +0000 (01:02 +0000)]
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
am:
89f6f7aa01
* commit '
89f6f7aa01591e8524ef0c4b5efa7433d082a9b9':
DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
Change-Id: I0e07966827713405ac2145a44185fe2f485c6e62
The Android Automerger [Mon, 23 May 2016 20:57:11 +0000 (13:57 -0700)]
"NRD53B"
Vikas Marwaha [Mon, 23 May 2016 20:39:56 +0000 (20:39 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
Zach Jang [Mon, 23 May 2016 20:26:32 +0000 (13:26 -0700)]
Updating security string to 2016-07-01
b/
28912173
Change-Id: Ib40892d3185285cf4e95abb655a96c76258e17b1
Zach Jang [Mon, 23 May 2016 20:19:30 +0000 (13:19 -0700)]
DO NOT MERGE Updating security string to 2016-07-01
- for klp-dev only
b/
28912173
Change-Id: I233f130629bc7f3b8f44bcc1e05177a17e0448b5
The Android Automerger [Mon, 23 May 2016 07:05:51 +0000 (00:05 -0700)]
"NRD53"
The Android Automerger [Mon, 23 May 2016 07:02:30 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 22 May 2016 07:07:55 +0000 (00:07 -0700)]
"NRD52"
The Android Automerger [Sun, 22 May 2016 07:02:38 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Baligh Uddin [Sat, 21 May 2016 00:27:18 +0000 (17:27 -0700)]
Baligh Uddin [Sat, 21 May 2016 00:14:04 +0000 (17:14 -0700)]
Baligh Uddin [Sat, 21 May 2016 00:04:37 +0000 (00:04 +0000)]
Merge commit \'
8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
am:
275af3429f
* commit '
275af3429f3049378862883dc6a0db2701f9311f':
Add Oem Props to otatools package
Change-Id: I7e26f26d773c1dac31b274b6c7e708aee1537be8
The Android Automerger [Sat, 21 May 2016 00:03:16 +0000 (17:03 -0700)]
"NRD49D"
Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]
Baligh Uddin [Fri, 20 May 2016 23:50:56 +0000 (23:50 +0000)]
Merge commit \'
c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
am:
50cae53b10
* commit '
50cae53b10b7e6a18fe6016bd5dc9eaba715545d':
Add Oem Props to otatools package
Change-Id: I4ca967ea935f4a3a5c709047ca2ed486d196e974
Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]
Andreas Gampe [Fri, 20 May 2016 18:05:38 +0000 (11:05 -0700)]
Build: Only use compiled-classes file when available
Don't pull in things from frameworks/base when they're not there.
Bug:
28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
The Android Automerger [Fri, 20 May 2016 19:26:59 +0000 (12:26 -0700)]
"NRD49C"
Baligh Uddin [Fri, 20 May 2016 18:43:25 +0000 (18:43 +0000)]
Add Oem Props to otatools package
am:
4f8df41cef
* commit '
4f8df41ceff7434ece651737b15bf1035f5549e8':
Add Oem Props to otatools package
Change-Id: I2b5ba1bb090c5144f4ea0b17153352eb31b46e7f
Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]
Add Oem Props to otatools package
Bug:
23967152
The Android Automerger [Fri, 20 May 2016 00:56:07 +0000 (17:56 -0700)]
"NRD49B"
Alan Viverette [Thu, 19 May 2016 19:39:10 +0000 (19:39 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
Baligh Uddin [Thu, 19 May 2016 16:52:12 +0000 (16:52 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef am:
cea440c2eb
am:
9606ea8a43 -s ours
* commit '
9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc
Baligh Uddin [Thu, 19 May 2016 16:47:58 +0000 (16:47 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am:
74da4d6eef
am:
cea440c2eb
* commit '
cea440c2ebb8982158adc8bebf3a4cd85a5950fd':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia8380c1e5f81d7225baee928ba2a35290aca4f85
Baligh Uddin [Thu, 19 May 2016 16:43:34 +0000 (16:43 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
am:
74da4d6eef
* commit '
74da4d6eef1da6490729dfbd069adf913d9aa6fa':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Iefc0f7c90f631d6298931c9426d8edfbb60aa437
Baligh Uddin [Thu, 19 May 2016 15:50:19 +0000 (08:50 -0700)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
otatools.zip is used to release key sign device images.
Bug:
23967152
The Android Automerger [Thu, 19 May 2016 07:06:07 +0000 (00:06 -0700)]
"NRD49"
The Android Automerger [Thu, 19 May 2016 07:02:27 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Andreas Gampe [Thu, 19 May 2016 03:10:43 +0000 (20:10 -0700)]
Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.
Bug:
28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
The Android Automerger [Wed, 18 May 2016 22:53:00 +0000 (15:53 -0700)]
"NRD48B"
TreeHugger Robot [Wed, 18 May 2016 16:17:17 +0000 (16:17 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
The Android Automerger [Wed, 18 May 2016 07:05:40 +0000 (00:05 -0700)]
"NRD48"
The Android Automerger [Wed, 18 May 2016 07:02:26 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Stefan De Clercq [Tue, 17 May 2016 20:53:09 +0000 (20:53 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
am:
2937ec60ea -s ours
* commit '
2937ec60ea64b5e1e821b40a227542b1d95b5bb4':
Add SDK 10 and 11 to list of supported Mac SDKs
Change-Id: I9dfc020e3f9083a02fc831b86294af0f26891526
Alex Klyubin [Tue, 17 May 2016 20:33:34 +0000 (13:33 -0700)]
Uncompress native libs only if they are compressed.
This changes the build system to uncompress native libraries in
preinstalled APKs only if the libraries are actually compressed.
Previously, any preinstalled APK containing native libraries was
modified by having all native libraries removed from the APK and then
re-added to the APK in uncompressed form.
Bug:
27887819
Change-Id: I3db172133e141bb6282bf3ed7070b068a826724e
The Android Automerger [Tue, 17 May 2016 20:16:49 +0000 (13:16 -0700)]
"NRD47B"
Stefan De Clercq [Tue, 17 May 2016 20:09:01 +0000 (20:09 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
The Android Automerger [Tue, 17 May 2016 07:06:39 +0000 (00:06 -0700)]
"NRD47"
The Android Automerger [Tue, 17 May 2016 07:02:37 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
Billy Lamberta [Mon, 16 May 2016 22:21:47 +0000 (22:21 +0000)]
docs: work minisite am:
09304b21b3
am:
05f772fe6b
* commit '
05f772fe6bb53190477d6b92e8098d53994cfdbf':
docs: work minisite
Change-Id: Ifff07a8a5d6b5aa9011226ec8d512f5e800ff4df
Billy Lamberta [Mon, 16 May 2016 22:15:52 +0000 (22:15 +0000)]
docs: work minisite
am:
09304b21b3
* commit '
09304b21b33f13480d4df58b53df89e6e1356537':
docs: work minisite
Change-Id: I3ee5ddd408506dbdce2168e8aeaa3a1a87442005
Billy Lamberta [Tue, 3 May 2016 22:28:41 +0000 (15:28 -0700)]
docs: work minisite
Changes needed to build the new directory
frameworks/base/docs/html/work. Support for
resource cards and navigation.
bug:
27744376
Change-Id: I8556eb0e2cf86eb83be395a97306d220394827cd
The Android Automerger [Mon, 16 May 2016 20:13:51 +0000 (13:13 -0700)]
"NRD46B"
Amith Yamasani [Fri, 13 May 2016 18:25:07 +0000 (11:25 -0700)]
Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?
Bug:
28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
Alan Viverette [Mon, 16 May 2016 15:01:38 +0000 (15:01 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
am:
5b30101722
* commit '
5b3010172211583034d1cf5eac41583dae79d77a':
Add missing support library projects to pathmap
Change-Id: Ia5c43c59bd4ff26a2d1069f38205ee7a5de2181b
Alan Viverette [Mon, 16 May 2016 14:56:01 +0000 (14:56 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev
The Android Automerger [Mon, 16 May 2016 07:03:27 +0000 (00:03 -0700)]
"NRD46"
The Android Automerger [Mon, 16 May 2016 07:02:15 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Joe Fernandez [Mon, 16 May 2016 01:13:40 +0000 (01:13 +0000)]
docs: Wear Preview - update TOC navigation behavior am:
f8e4e54b89
am:
f9601a7ad2
* commit '
f9601a7ad261772cf0f89df267de6998fd65cc48':
docs: Wear Preview - update TOC navigation behavior
Change-Id: I4304642d26f0b975cb50bfdd53a04167d186b268