OSDN Git Service

android-x86/build.git
8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 7 Jun 2016 07:02:26 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years agoNRD67B
The Android Automerger [Mon, 6 Jun 2016 23:56:15 +0000 (16:56 -0700)]
NRD67B

8 years agoNYC is 7.0
Ian Pedowitz [Wed, 1 Jun 2016 00:36:44 +0000 (17:36 -0700)]
NYC is 7.0

Bug: 29056633
Change-Id: Ib0186c5affd16b5223ba547b2cfff49d830dac1c

8 years agoMerge "Add default values for pm.dexopt.core-app." into nyc-dev
Narayan Kamath [Mon, 6 Jun 2016 14:48:03 +0000 (14:48 +0000)]
Merge "Add default values for pm.dexopt.core-app." into nyc-dev

8 years ago"NRD67"
The Android Automerger [Mon, 6 Jun 2016 07:04:55 +0000 (00:04 -0700)]
"NRD67"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 6 Jun 2016 07:02:23 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years ago"NRD66"
The Android Automerger [Sun, 5 Jun 2016 07:08:07 +0000 (00:08 -0700)]
"NRD66"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 5 Jun 2016 07:02:59 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years ago"NRD63C"
The Android Automerger [Fri, 3 Jun 2016 23:05:11 +0000 (16:05 -0700)]
"NRD63C"

8 years agoNYC is now REL
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL

PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121

8 years agoNYC is now REL
Ian Pedowitz [Tue, 31 May 2016 22:32:31 +0000 (15:32 -0700)]
NYC is now REL

PLATFORM_VERSION_ALL_CODENAMES needs to include N for now

Bug: 28810934
Bug: 29117805
Change-Id: Ibf44e1e02077e7830d9bf92b87fb8ccae029c121

8 years ago"NRD63B"
The Android Automerger [Fri, 3 Jun 2016 00:53:11 +0000 (17:53 -0700)]
"NRD63B"

8 years agoAdd default values for pm.dexopt.core-app.
Narayan Kamath [Thu, 2 Jun 2016 15:34:37 +0000 (16:34 +0100)]
Add default values for pm.dexopt.core-app.

bug: 28998083

Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd

8 years ago"NRD63"
The Android Automerger [Thu, 2 Jun 2016 07:04:59 +0000 (00:04 -0700)]
"NRD63"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 2 Jun 2016 07:02:29 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years agodisable unpriv perf by default in user{,debug} builds
Daniel Micay [Tue, 17 May 2016 04:40:52 +0000 (00:40 -0400)]
disable unpriv perf by default in user{,debug} builds

(Cherry picked from commit fe01f56c0d5c42508e1e82f5976e4c10bb00f632)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6

8 years ago"NRD62B"
The Android Automerger [Wed, 1 Jun 2016 22:50:28 +0000 (15:50 -0700)]
"NRD62B"

8 years ago"NRD62"
The Android Automerger [Wed, 1 Jun 2016 07:05:28 +0000 (00:05 -0700)]
"NRD62"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 1 Jun 2016 07:02:31 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years ago"NRD61C"
The Android Automerger [Tue, 31 May 2016 23:46:27 +0000 (16:46 -0700)]
"NRD61C"

8 years ago"NRD61B"
The Android Automerger [Tue, 31 May 2016 22:49:44 +0000 (15:49 -0700)]
"NRD61B"

8 years ago"NRD61"
The Android Automerger [Tue, 31 May 2016 07:04:36 +0000 (00:04 -0700)]
"NRD61"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 31 May 2016 07:02:23 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years ago"NRD60"
The Android Automerger [Mon, 30 May 2016 07:03:56 +0000 (00:03 -0700)]
"NRD60"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 30 May 2016 07:02:24 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years ago"NRD59"
The Android Automerger [Sun, 29 May 2016 07:08:07 +0000 (00:08 -0700)]
"NRD59"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 29 May 2016 07:03:20 +0000 (00:03 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years agoMerge "Add build number to apps' version name for non-platform build" into nyc-dev
Lance Jin-woong Chang [Sat, 28 May 2016 18:28:39 +0000 (18:28 +0000)]
Merge "Add build number to apps' version name for non-platform build" into nyc-dev

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools am: e718501021 am...
Baligh Uddin [Fri, 27 May 2016 23:45:56 +0000 (23:45 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools am: e718501021 am: 5d77e7e0c1
am: 9f527d5222

* commit '9f527d52229c973fddd94b926b803a6be68ae440':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ie7d8b7401ee58ace28a089f97eeb4bc00c43c100

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools am: e718501021
Baligh Uddin [Fri, 27 May 2016 23:42:55 +0000 (23:42 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools am: e718501021
am: 5d77e7e0c1

* commit '5d77e7e0c1425c8d1ed60dd5425267ce79ef4648':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I6a242bbdf47b588064c94b90f47ffdd5dabef1cc

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools
Baligh Uddin [Fri, 27 May 2016 23:40:02 +0000 (23:40 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools
am: e718501021

* commit 'e718501021dd039875745d3ff829341c2bb05248':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I25d3edc76e97f1249768bd9e9bbbecdf8fc5fe79

8 years agoDO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours am: a21a89051e -s ours
Baligh Uddin [Fri, 27 May 2016 23:37:47 +0000 (23:37 +0000)]
DO NOT MERGE ANYWHERE - am: 442ae0fe5c  -s ours am: a21a89051e  -s ours
am: 88582dfa7b  -s ours

* commit '88582dfa7bb9be8e87b091a7fa705b6669390f8d':
  DO NOT MERGE ANYWHERE -

Change-Id: Ia1ead07bfb9a89d85de883ca25c403a7b8d18042

8 years agoDO NOT MERGE ANYWHERE - am: 442ae0fe5c -s ours
Baligh Uddin [Fri, 27 May 2016 23:34:54 +0000 (23:34 +0000)]
DO NOT MERGE ANYWHERE - am: 442ae0fe5c  -s ours
am: a21a89051e  -s ours

* commit 'a21a89051e1b4fdef4aa06f7d17f188d6fbcefe6':
  DO NOT MERGE ANYWHERE -

Change-Id: I647de52990f81a5a713f1cdd6064dd4a853144d5

8 years agoDO NOT MERGE ANYWHERE -
Baligh Uddin [Fri, 27 May 2016 23:32:09 +0000 (23:32 +0000)]
DO NOT MERGE ANYWHERE -
am: 442ae0fe5c  -s ours

* commit '442ae0fe5c76ddabe52e595689a86838820ecbf1':
  DO NOT MERGE ANYWHERE -

Change-Id: I5bbd69cd7d85e3b4257d365efe07c38586d45433

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools
Baligh Uddin [Fri, 27 May 2016 23:28:36 +0000 (16:28 -0700)]
Add system/extras/verity/build_verity_metadata.py  to otatools

Bug: 29008004

8 years agoDO NOT MERGE ANYWHERE -
Baligh Uddin [Fri, 27 May 2016 23:19:57 +0000 (23:19 +0000)]
DO NOT MERGE ANYWHERE -

Broke the build in mnc-dr-dev

Revert "Add system/extras/verity/build_verity_metadata.py  to otatools"

Bug: 29008004

This reverts commit d26a99c3c6903c02c5435ec5f0123f057527b0a9.

Change-Id: Ic56a3d382a48a68f6c6f97684c045ec943be1423

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6 am...
Baligh Uddin [Fri, 27 May 2016 22:43:20 +0000 (22:43 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools am: d26a99c3c6 am: 1e7c1290c6
am: b25a7f38a8

* commit 'b25a7f38a876ee2f9acd90123021401ce73d3aac':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I44dd9e4662d3c4b87545f278f7b22c9535b06356

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools am: d26a99c3c6
Baligh Uddin [Fri, 27 May 2016 22:40:22 +0000 (22:40 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools am: d26a99c3c6
am: 1e7c1290c6

* commit '1e7c1290c68263c727d20cdfffa845fea0fdc4b1':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: Ic2f9e99d76369335edc481e6f13316bb99107e8d

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools
Baligh Uddin [Fri, 27 May 2016 22:37:29 +0000 (22:37 +0000)]
Add system/extras/verity/build_verity_metadata.py  to otatools
am: d26a99c3c6

* commit 'd26a99c3c6903c02c5435ec5f0123f057527b0a9':
  Add system/extras/verity/build_verity_metadata.py  to otatools

Change-Id: I94f04639338cdb961f3c378b12b8778c89fed232

8 years agoAdd system/extras/verity/build_verity_metadata.py to otatools
Baligh Uddin [Fri, 27 May 2016 21:59:48 +0000 (14:59 -0700)]
Add system/extras/verity/build_verity_metadata.py  to otatools

Bug: 29008004

8 years agoMerge "Remove Dev Settings app from emulator images" into nyc-dev
Bjoern Johansson [Fri, 27 May 2016 17:19:12 +0000 (17:19 +0000)]
Merge "Remove Dev Settings app from emulator images" into nyc-dev

8 years agoFix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804
Dirk Dougherty [Thu, 26 May 2016 23:49:38 +0000 (23:49 +0000)]
Fix improper date reference in blog reader. am: 2732bb762a am: 0f6d425804
am: 53cd365b2d

* commit '53cd365b2d2c2b074d628147a8a382275075bd1d':
  Fix improper date reference in blog reader.

Change-Id: I300892c3c4439354917872839c18e4c029160df1

8 years agoFix improper date reference in blog reader. am: 2732bb762a
Dirk Dougherty [Thu, 26 May 2016 23:46:18 +0000 (23:46 +0000)]
Fix improper date reference in blog reader. am: 2732bb762a
am: 0f6d425804

* commit '0f6d425804d7fd60dc82b9fe0c4ce585aa9e5eed':
  Fix improper date reference in blog reader.

Change-Id: I9641b21d8841f2847836c691eba8bfb89497417d

8 years agoFix improper date reference in blog reader.
Dirk Dougherty [Thu, 26 May 2016 23:43:35 +0000 (23:43 +0000)]
Fix improper date reference in blog reader.
am: 2732bb762a

* commit '2732bb762a00828f36bda77c43c7fd14c7495cde':
  Fix improper date reference in blog reader.

Change-Id: I5ff0d1d2b16ae712b6e92ef64c023574d2e7bfe5

8 years ago"NRD56B"
The Android Automerger [Thu, 26 May 2016 23:27:07 +0000 (16:27 -0700)]
"NRD56B"

8 years agoFix improper date reference in blog reader.
Dirk Dougherty [Thu, 26 May 2016 20:05:10 +0000 (13:05 -0700)]
Fix improper date reference in blog reader.

Change-Id: I9f1a32a68da2d21ea02b95df8cd7dfc4396a445f

8 years agoAdd build number to apps' version name for non-platform build
Lance Chang [Thu, 26 May 2016 19:32:30 +0000 (12:32 -0700)]
Add build number to apps' version name for non-platform build

If TARGET_BUILD_WITH_APPS_VERSION_NAME is defined, the build system
will add build number to the apps' default version name.

Bug: 28982976
Change-Id: I536f273b557fe7c935cc4ef1052c3297f8029863

8 years agoRevert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880...
Amanda Kassay [Thu, 26 May 2016 18:33:54 +0000 (18:33 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880 am: 0eefec03a7
am: ecaacf87cd

* commit 'ecaacf87cd038beb4aad5d6ddc6c1cc1725dca4a':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I07e3e36f3dd322fde3067e63a66ac9f5e87e7385

8 years agoRevert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880
Amanda Kassay [Thu, 26 May 2016 18:28:40 +0000 (18:28 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback." am: 8bac6eb880
am: 0eefec03a7

* commit '0eefec03a76e5e0201293331dd67baf52dc13ceb':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I9dc0292d9615d5cd1f888a4ac92b45b0b3d6ffb4

8 years agoRevert "Updated default.css and docs.js for DoD transition fallback."
Amanda Kassay [Thu, 26 May 2016 18:22:56 +0000 (18:22 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."
am: 8bac6eb880

* commit '8bac6eb880992e0a4dd37b0f1cf039feebb483ae':
  Revert "Updated default.css and docs.js for DoD transition fallback."

Change-Id: I33f169f14f2e7b993e30c00fe59016357242f288

8 years agoRevert "Updated default.css and docs.js for DoD transition fallback."
Amanda Kassay [Thu, 26 May 2016 17:58:23 +0000 (17:58 +0000)]
Revert "Updated default.css and docs.js for DoD transition fallback."

This reverts commit 4d5bcbf62a0cc6ec1db0c860a818b6166dceed74.

Change-Id: I45dc33a7711f435fd35b51bb0cb44445e6edd918

8 years ago"NRD56"
The Android Automerger [Thu, 26 May 2016 07:06:56 +0000 (00:06 -0700)]
"NRD56"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 26 May 2016 07:02:32 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

8 years agoRemove Dev Settings app from emulator images
Bjoern Johansson [Thu, 26 May 2016 01:26:14 +0000 (18:26 -0700)]
Remove Dev Settings app from emulator images

The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.

BUG: 27549126

Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25

8 years ago"NRD55B"
The Android Automerger [Thu, 26 May 2016 01:17:12 +0000 (18:17 -0700)]
"NRD55B"

8 years agoMerge "N is API 24" into nyc-dev
TreeHugger Robot [Thu, 26 May 2016 01:03:06 +0000 (01:03 +0000)]
Merge "N is API 24" into nyc-dev

8 years agoN is API 24
Adam Powell [Wed, 25 May 2016 23:48:56 +0000 (16:48 -0700)]
N is API 24

Change-Id: I8e4fbc1d64a6cd3eb0b4765f696ae48170264d52

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
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

8 years agoMerge "Report error codes in the OTA update script" into nyc-dev
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f am...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev am: ab6c08949f
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoMerge "Updating security string to 2016-07-05" into lmp-mr1-dev
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a...
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375 am: 555c5af89a
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

8 years agoDO NOT MERGE Updating security string to 2016-07-05 am: f885e95375
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

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

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

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

8 years agoReport error codes in the OTA update script
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

8 years ago"NRD55"
The Android Automerger [Wed, 25 May 2016 07:07:03 +0000 (00:07 -0700)]
"NRD55"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Wed, 25 May 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

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 ago"NRD54B"
The Android Automerger [Tue, 24 May 2016 20:22:02 +0000 (13:22 -0700)]
"NRD54B"

8 years ago"NRD54"
The Android Automerger [Tue, 24 May 2016 07:05:42 +0000 (00:05 -0700)]
"NRD54"

8 years agomerge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 24 May 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev

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: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 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: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: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: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: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 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 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