OSDN Git Service

android-x86/build.git
8 years agogoldfish_setup: grant /system/bin/sh exec access
Nick Kralevich [Wed, 25 May 2016 05:17:42 +0000 (05:17 +0000)]
goldfish_setup: grant /system/bin/sh exec access
am: 501c88c029

* commit '501c88c0290eb2308c110398f106411260863bb8':
  goldfish_setup: grant /system/bin/sh exec access

Change-Id: Ib4ee988474a69deca4aac9f22b36572d8b026fcc

8 years agogoldfish_setup: grant /system/bin/sh exec access
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

8 years agoPass squashfs block size as a parameter
Mohamad Ayyash [Tue, 24 May 2016 19:59:30 +0000 (12:59 -0700)]
Pass squashfs block size as a parameter

BUG: 28920352
Change-Id: Ifed02bd1565131814047991ec87fa61691bfe240
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
Zach Jang [Tue, 24 May 2016 01:34:46 +0000 (01:34 +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
am: 2af23a3c20

* commit '2af23a3c208b4480998923edc1479919093bc6b9':
  DO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only

Change-Id: Ia0b764a4ff323bd52e92d0c1814e0940ed3dfd2d

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d...
Zach Jang [Tue, 24 May 2016 01:22:06 +0000 (01:22 +0000)]
Updating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d am: 3e082f1e64 am: 608f329e07 am: 2d75d4447c am: 3ffee87b5c
am: f8a869d5d8

* commit 'f8a869d5d8a3989e240cde063322f9441ad35d16':
  Updating security string to 2016-07-01

Change-Id: I6f30c8da2bb3476dcb2a0d3e5befca81dbd66c0d

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78 am: 0b4608ca4d
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b am: 1dd3095e78
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01...
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

8 years agoUpdating security string to 2016-07-01 am: 45ff24a04b
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only am: 89f6f7aa01
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

8 years agoUpdating security string to 2016-07-01
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01 - for klp-dev only
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

8 years agoMerge "Build: Only use compiled-classes file when available" into nyc-dev
Andreas Gampe [Mon, 23 May 2016 20:47:56 +0000 (20:47 +0000)]
Merge "Build: Only use compiled-classes file when available" into nyc-dev
am: 57c3aea442

* commit '57c3aea442bff67e4452eee7ff8f13294fbad34b':
  Build: Only use compiled-classes file when available

Change-Id: Ib203e586560d98828ed2be6c65d6fe915c68b096

8 years agoMerge "Build: Only use compiled-classes file when available" into nyc-dev
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

8 years agoUpdating security string to 2016-07-01
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

8 years agoDO NOT MERGE Updating security string to 2016-07-01
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

8 years agoMerge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
Baligh Uddin [Sat, 21 May 2016 00:31:19 +0000 (00:31 +0000)]
Merge commit \'9b4daacaf8f7ce5a534fae524507e4a4f7622ce4\' into nyc-dev
am: 0418406186

* commit '0418406186f67096a3c42fa276799095620e2296':
  Add Oem Props to otatools package

Change-Id: I11ac21e62912328ec5bb19cb4b341c5b8e331ba1

8 years agoMerge commit '9b4daacaf8f7ce5a534fae524507e4a4f7622ce4' into nyc-dev
Baligh Uddin [Sat, 21 May 2016 00:27:18 +0000 (17:27 -0700)]
Merge commit '9b4daacaf8f7ce5a534fae524507e4a4f7622ce4' into nyc-dev

8 years agoMerge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev
Baligh Uddin [Sat, 21 May 2016 00:14:04 +0000 (17:14 -0700)]
Merge commit '6c70b85cb3c75650e5154366fb5e08e3aadf9a50' into mnc-dr1.5-dev

8 years agoMerge commit \'8c0c5e61498783496eec848da4f2aa4e30fe98b6\' into mnc-dr-dev
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

8 years agoMerge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev
Baligh Uddin [Fri, 20 May 2016 23:59:14 +0000 (16:59 -0700)]
Merge commit '8c0c5e61498783496eec848da4f2aa4e30fe98b6' into mnc-dr-dev

8 years agoMerge commit \'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b\' into lmp-mr1-ub-dev
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

8 years agoMerge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev
Baligh Uddin [Fri, 20 May 2016 23:44:27 +0000 (16:44 -0700)]
Merge commit 'c1937df4b12afecfdfc6a5d3b37f0aaf6ffdda5b' into lmp-mr1-ub-dev

8 years agoBuild: Only use compiled-classes file when available
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

8 years agoAdd Oem Props to otatools package
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

8 years agoAdd Oem Props to otatools package
Baligh Uddin [Fri, 20 May 2016 18:29:53 +0000 (11:29 -0700)]
Add Oem Props to otatools package

Bug: 23967152

8 years agoMerge "Add documents-archive to SDK, docs builds" into nyc-dev
Alan Viverette [Thu, 19 May 2016 19:48:48 +0000 (19:48 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev
am: 88b0d6a63d

* commit '88b0d6a63d8149d14032d298eccde79a6d3079d4':
  Add documents-archive to SDK, docs builds

Change-Id: Ibf8c94e84df0f7468b546dbe8e7d60eb9e996118

8 years agoMerge "Add documents-archive to SDK, docs builds" into nyc-dev
Alan Viverette [Thu, 19 May 2016 19:39:10 +0000 (19:39 +0000)]
Merge "Add documents-archive to SDK, docs builds" into nyc-dev

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am...
Baligh Uddin [Thu, 19 May 2016 16:56:20 +0000 (16:56 +0000)]
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43  -s ours
am: 3c42a21466

* commit '3c42a2146612209e7b8eab749cbafe7f0782e942':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: I1d33fe6afec785e30fc57f62780920f1bb813e3c

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am...
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

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am...
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

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
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

8 years agoDO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
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

8 years agoBuild: Use phone compiled-classes in core_minimal
Andreas Gampe [Thu, 19 May 2016 05:10:54 +0000 (05:10 +0000)]
Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

* commit '695b28f67c88b87486911f8881078e7857e989a8':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I00488cf31df5b997de619656dd7541788747fb18

8 years agoBuild: Use phone compiled-classes in core_minimal
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

8 years agoMerge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev
Tao Bao [Wed, 18 May 2016 21:59:48 +0000 (21:59 +0000)]
Merge "Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"" into nyc-mr1-dev

8 years agoRevert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"
Tao Bao [Wed, 18 May 2016 00:17:10 +0000 (17:17 -0700)]
Revert "Setting PLATFORM_VERSION(_CODENAME)? to NMR1"

This reverts commit 439971af5d63b1c5175f14f15f99394a95e34496.

Bug: 28713307
Bug: 28817009
Change-Id: I96c9ec9e3f1be6d68eb77df596707568e344a2fc

8 years agoMerge "Uncompress native libs only if they are compressed." into nyc-dev
Alex Klyubin [Wed, 18 May 2016 16:25:46 +0000 (16:25 +0000)]
Merge "Uncompress native libs only if they are compressed." into nyc-dev
am: 451b72438e

* commit '451b72438e974a10f3f9062ced5d455d3234e4dd':
  Uncompress native libs only if they are compressed.

Change-Id: I9b4f21468db91955b021c744e83efba8b126dc0e

8 years agoMerge "Uncompress native libs only if they are compressed." into nyc-dev
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

8 years agoMerge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60e...
Stefan De Clercq [Tue, 17 May 2016 20:57:00 +0000 (20:57 +0000)]
Merge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev am: 2937ec60ea  -s ours
am: 9497f830a2

* commit '9497f830a25f90ed63b06a2f2636a9c99edd9979':
  Add SDK 10 and 11 to list of supported Mac SDKs

Change-Id: Ic907b685fe84abca5d7dcf836747a3120fcf5ab0

8 years agoMerge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-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

8 years agoUncompress native libs only if they are compressed.
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

8 years agoMerge "Add SDK 10 and 11 to list of supported Mac SDKs" into mnc-ub-dev
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

8 years agoMerge "Add CtsShimPrebuilt" into nyc-dev
Amith Yamasani [Tue, 17 May 2016 00:32:49 +0000 (00:32 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev
am: 85c33f500a

* commit '85c33f500aa2ef7c70c1644617e7439b97f22a79':
  Add CtsShimPrebuilt

Change-Id: I3448eef2b50c83b2c058a9e8a5ba5b848ff84c18

8 years agoMerge "Add CtsShimPrebuilt" into nyc-dev
Amith Yamasani [Tue, 17 May 2016 00:27:54 +0000 (00:27 +0000)]
Merge "Add CtsShimPrebuilt" into nyc-dev

8 years agodocs: work minisite am: 09304b21b3 am: 05f772fe6b
Billy Lamberta [Mon, 16 May 2016 22:26:59 +0000 (22:26 +0000)]
docs: work minisite am: 09304b21b3 am: 05f772fe6b
am: f06c24f0c1

* commit 'f06c24f0c1b06aaf24637c1392cd61f9bb52f66f':
  docs: work minisite

Change-Id: Id89abfa461445983cc02ed3b4f52b1c2bfb4c85c

8 years agodocs: work minisite am: 09304b21b3
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

8 years agodocs: work minisite
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

8 years agodocs: work minisite
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

8 years agoAdd CtsShimPrebuilt
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

8 years agoMerge "Add missing support library projects to pathmap" into mnc-ub-dev am: 5b30101722
Alan Viverette [Mon, 16 May 2016 15:04:40 +0000 (15:04 +0000)]
Merge "Add missing support library projects to pathmap" into mnc-ub-dev am: 5b30101722
am: c608284d22

* commit 'c608284d22b95733e6b3a24f84084d9268eeabdf':
  Add missing support library projects to pathmap

Change-Id: I0e2d265dbdde5ec6d8c5c5588e5a8e505be46c74

8 years agoMerge "Add missing support library projects to pathmap" into mnc-ub-dev
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

8 years agoMerge "Add missing support library projects to pathmap" into mnc-ub-dev
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

8 years agodocs: Wear Preview - update TOC navigation behavior am: f8e4e54b89 am: f9601a7ad2
Joe Fernandez [Mon, 16 May 2016 01:16:27 +0000 (01:16 +0000)]
docs: Wear Preview - update TOC navigation behavior am: f8e4e54b89 am: f9601a7ad2
am: f1ed84693e

* commit 'f1ed84693e5be34bebeafe1eb78a2f0cb6041b65':
  docs: Wear Preview - update TOC navigation behavior

Change-Id: I37181d89fc81f6d0c82248347893e5d599c9bf79

8 years agodocs: Wear Preview - update TOC navigation behavior am: f8e4e54b89
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

8 years agodocs: Wear Preview - update TOC navigation behavior
Joe Fernandez [Mon, 16 May 2016 01:10:52 +0000 (01:10 +0000)]
docs: Wear Preview - update TOC navigation behavior
am: f8e4e54b89

* commit 'f8e4e54b89cf381a725e8be9e05eee2bb94b0f2c':
  docs: Wear Preview - update TOC navigation behavior

Change-Id: I9cbf81eec6b55a40d573c0160b7f7936bd0eb621

8 years agodocs: Wear Preview - update TOC navigation behavior
Joe Fernandez [Mon, 16 May 2016 00:55:44 +0000 (17:55 -0700)]
docs: Wear Preview - update TOC navigation behavior

b/28004352

Change-Id: I1818c7b0def80e5871a0e6abf0353e9216164e1f

8 years agoUpdated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a am: 613cf...
Amanda Kassay [Sat, 14 May 2016 15:38:25 +0000 (15:38 +0000)]
Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a am: 613cf217cf am: 18840d1ecb
am: 600ccf1185

* commit '600ccf1185bf6c1ad095297d3092242e1d5c1e67':
  Updated default.css and docs.js for DoD transition fallback.

Change-Id: I470216b5ee5cd4e980c414e260cd98f861e50cb6

8 years agoUpdated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a am: 613cf...
Amanda Kassay [Sat, 14 May 2016 15:35:22 +0000 (15:35 +0000)]
Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a am: 613cf217cf
am: 18840d1ecb

* commit '18840d1ecbeeb4691e61a5745757c56af95d87fc':
  Updated default.css and docs.js for DoD transition fallback.

Change-Id: I2b1a4174aee4c85df917431135529798790fd8cf

8 years agoUpdated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a
Amanda Kassay [Sat, 14 May 2016 15:32:26 +0000 (15:32 +0000)]
Updated default.css and docs.js for DoD transition fallback. am: 4d5bcbf62a
am: 613cf217cf

* commit '613cf217cf3f60cadd6235e0336df2e076588e3c':
  Updated default.css and docs.js for DoD transition fallback.

Change-Id: I4025f00dd7958af44c2aa3475f3ac397246e55e6

8 years agoUpdated default.css and docs.js for DoD transition fallback.
Amanda Kassay [Sat, 14 May 2016 15:29:30 +0000 (15:29 +0000)]
Updated default.css and docs.js for DoD transition fallback.
am: 4d5bcbf62a

* commit '4d5bcbf62a0cc6ec1db0c860a818b6166dceed74':
  Updated default.css and docs.js for DoD transition fallback.

Change-Id: I22a7466baee5d752542000565afb826eef06c96d

8 years agoMerge "Makefile: exclude cache symlink on devices with no cache partition" into nyc...
TreeHugger Robot [Sat, 14 May 2016 03:27:50 +0000 (03:27 +0000)]
Merge "Makefile: exclude cache symlink on devices with no cache partition" into nyc-mr1-dev

8 years agoAdd SDK 10 and 11 to list of supported Mac SDKs
Stefan De Clercq [Fri, 13 May 2016 23:43:13 +0000 (16:43 -0700)]
Add SDK 10 and 11 to list of supported Mac SDKs

Change-Id: Id558ef72e03626e3e577bc1a4f5ab85d6fe8efc5

8 years agodocs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800 am:...
Joe Fernandez [Fri, 13 May 2016 23:48:31 +0000 (23:48 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800 am: 84a8735017
am: a067357b5a

* commit 'a067357b5a8c6d4b271ae43ca9507091ea3d545b':
  docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: Ic215bc12cce9207162dab40f5d84cd73f1a9a63a

8 years agodocs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800
Joe Fernandez [Fri, 13 May 2016 23:45:57 +0000 (23:45 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation am: f38a01d800
am: 84a8735017

* commit '84a873501701f7846c09b4bff604e65c2c38a9bd':
  docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: I9b9974a0e180139dccea8867f3675473b95ba5be

8 years agodocs: Instant Apps - enable TOC and navigation for navigation
Joe Fernandez [Fri, 13 May 2016 23:43:22 +0000 (23:43 +0000)]
docs: Instant Apps - enable TOC and navigation for navigation
am: f38a01d800

* commit 'f38a01d800b05187db6515527df919a1a8dec6f5':
  docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: I1b05ae4d00f7ac446274978dc6f32fa98c804d81

8 years agodocs: Instant Apps - enable TOC and navigation for navigation
Joe Fernandez [Fri, 13 May 2016 22:43:25 +0000 (15:43 -0700)]
docs: Instant Apps - enable TOC and navigation for navigation

Change-Id: I7a259da8618f090a8146d4f42608ebc8baf73af1

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0 am: 801dc892...
Tao Bao [Fri, 13 May 2016 22:46:50 +0000 (22:46 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0 am: 801dc8925f am: cb5268ef2e  -s ours
am: fb9e214b8c

* commit 'fb9e214b8c227fba93e668b824612038c816edf1':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I2ce21c445f84df1ad062404eced42b51f038a41f

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0 am: 801dc8925f
Tao Bao [Fri, 13 May 2016 22:44:16 +0000 (22:44 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0 am: 801dc8925f
am: cb5268ef2e  -s ours

* commit 'cb5268ef2e77073d76847eef6391683a3c288121':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: Ic47389e443ebe2aa91953082dd47ed9119f2f5a6

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
Tao Bao [Fri, 13 May 2016 22:41:42 +0000 (22:41 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check. am: 16536a53a0
am: 801dc8925f

* commit '801dc8925fcc148f438ceca751b2c14a853bece7':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I98966afb7be0c91d4985985a5abd05fee05e0d8f

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Tao Bao [Fri, 13 May 2016 22:39:07 +0000 (22:39 +0000)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.
am: 16536a53a0

* commit '16536a53a057778240b1a3a923b5dde31b79bd90':
  DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

Change-Id: I07d7bf9a34dabd3646f341427d9f53a74e9e8fc9

8 years agoMakefile: exclude cache symlink on devices with no cache partition
Patrick Tjin [Fri, 13 May 2016 22:26:09 +0000 (15:26 -0700)]
Makefile: exclude cache symlink on devices with no cache partition

rsync will complain due to broken cache symlink on devices
without cache partition when creating the recovery disk.
Recovery does not depend on /cache.

Bug: 28747374
Change-Id: Ie2dc6e84194fbc3bbb39fe59ef92a6e8936b71e2

8 years agoDO NOT MERGE rangelib.py: Fix the bug in monotonic check.
Tao Bao [Thu, 27 Aug 2015 00:07:14 +0000 (17:07 -0700)]
DO NOT MERGE rangelib.py: Fix the bug in monotonic check.

RangeSet("2-10").monotonic gives a wrong result of "False". Fix the bug
and add more tests into test_rangelib.py.

Bug: 28760775
Change-Id: I04780571b45ecafd34040f405756b9745a9e21a5
(cherry picked from commit e8f756137c39fc3292014f2eab5f84c6e5135797)

8 years agoUpdated default.css and docs.js for DoD transition fallback.
Amanda Kassay [Fri, 13 May 2016 16:24:39 +0000 (12:24 -0400)]
Updated default.css and docs.js for DoD transition fallback.

Change-Id: I0a978667b2ead38ba8dad8c90b173e9e91abd6f2

8 years agoMerge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev...
Baligh Uddin [Fri, 13 May 2016 18:27:29 +0000 (18:27 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev am: b0c6b7d072  -s ours
am: f042baf4cc

* commit 'f042baf4cc636c7d3a2a6804e3c2aa4aec6ce84a':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ib0f12199f1afceee75b2704f2f8be55c79fdec4a

8 years agoMerge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Tianjie Xu [Fri, 13 May 2016 18:18:57 +0000 (18:18 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
am: b0c6b7d072  -s ours

* commit 'b0c6b7d0722917a66aa4338e4f2b258cd221a4be':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: I2b969467e56cc9c6197a181545276f75d5188bca

8 years agoAdd documents-archive to SDK, docs builds
Alan Viverette [Fri, 13 May 2016 18:17:33 +0000 (14:17 -0400)]
Add documents-archive to SDK, docs builds

Bug: 28762753
Change-Id: I169adfb3124aac92cb3b96966667a2f8b4b78472

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558 am: 8ae473d18...
Tianjie Xu [Fri, 13 May 2016 18:15:52 +0000 (18:15 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558 am: 8ae473d182 am: 9e337ed21c  -s ours
am: fe740bacea

* commit 'fe740baceabd28a3978388865f47dfa2acbf4f3d':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Id0838453d4a57fddf108f927b285720a92dee0be

8 years agoAdd missing support library projects to pathmap
Alan Viverette [Fri, 13 May 2016 18:15:25 +0000 (14:15 -0400)]
Add missing support library projects to pathmap

Bug: 28716910
Change-Id: I8eab2d638b72d591e157958b7b043431263f4409

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558 am: 8ae473d182
Tianjie Xu [Fri, 13 May 2016 18:13:24 +0000 (18:13 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558 am: 8ae473d182
am: 9e337ed21c  -s ours

* commit '9e337ed21ceb8c31aaafdae67ecaa1a7c7451a47':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: I810854509e0fadd4e96ccf5b69c8c17fd29f9226

8 years agoMerge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev
Baligh Uddin [Fri, 13 May 2016 18:11:11 +0000 (18:11 +0000)]
Merge "DO NOT MERGE Monotonic flag sets incorrectly in rangelib" into mnc-dr1.5-dev

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
Tianjie Xu [Fri, 13 May 2016 18:10:55 +0000 (18:10 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib am: 8d11597558
am: 8ae473d182

* commit '8ae473d18280e25d010c040147393a3b1e3bbc75':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ibbed631ec32f00f026bdcf4af8a9a1213d87b4e5

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib
Tianjie Xu [Fri, 13 May 2016 18:08:12 +0000 (18:08 +0000)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib
am: 8d11597558

* commit '8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d':
  DO NOT MERGE Monotonic flag sets incorrectly in rangelib

Change-Id: Ie0180bab1d41d86d3d2c3f14501b51b50f74635e

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib

After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a7616092e5a315b0a421a0c082da144145)
(cherry picked from commit 8d1159755849ffcc1bd5c0de2821a4f5fe4ea58d)

8 years agoDO NOT MERGE Monotonic flag sets incorrectly in rangelib
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
DO NOT MERGE Monotonic flag sets incorrectly in rangelib

After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug: 28760775
Bug: 28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac
(cherry picked from commit cd1e16a7616092e5a315b0a421a0c082da144145)

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
Baligh Uddin [Thu, 12 May 2016 23:22:24 +0000 (23:22 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours am: 7e806813bb  -s ours am: e20dd6dca2  -s ours am: 63847c39a6  -s ours
am: 53380a8386  -s ours

* commit '53380a8386b977c8117d0030d65a1f004822ac11':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ib9bf2caab8b3db344b3de9ab8b5daaf0f14f8397

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
Baligh Uddin [Thu, 12 May 2016 23:19:56 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours am: 7e806813bb  -s ours am: e20dd6dca2  -s ours
am: 63847c39a6  -s ours

* commit '63847c39a64e7ab0a5e8564d887864c02a7ba2a5':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I289fc7b1d9ef94d6a298cfbd64ee6f66e8790b64

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
Baligh Uddin [Thu, 12 May 2016 23:17:37 +0000 (23:17 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours am: 7e806813bb  -s ours
am: e20dd6dca2  -s ours

* commit 'e20dd6dca20231b7e68f3a8874bccedc1e56c40f':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: I7391006c948be8188b8b197c1e318b76a826155a

8 years agoDO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65 -s ours am: d28e7...
Baligh Uddin [Thu, 12 May 2016 23:15:18 +0000 (23:15 +0000)]
DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev am: f193546d65  -s ours am: d28e7ea333  -s ours am: e038da17f3  -s ours am: e3b631a5d6  -s ours
am: 7e806813bb  -s ours

* commit '7e806813bb0c3df85c69aaa78a21d0d5dac7e92b':
  DO NOT MERGE ANYWHERE - Fix otatools on lmp-mr1-dev

Change-Id: Ic99ba9bb2041840402829b1d2e75684bfbeb66f2