diff options
author | Clay Murphy <claym@google.com> | 2017-07-05 18:28:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-05 18:28:51 +0000 |
commit | 26a6e1b2badf69ddc616ec51687c1d3ecfd8b646 (patch) | |
tree | 2f328d0210689bc9c33bcb0852617cf66e2791aa /en/devices/tech/ota/sign_builds.html | |
parent | d9c0a94dd500fc616309192152fa737a83c185d8 (diff) | |
parent | e839b247f863ec564ef505aa4451e839511f37aa (diff) | |
download | source.android.com-26a6e1b2badf69ddc616ec51687c1d3ecfd8b646.tar.gz |
resolve merge conflicts of 4a5bcd6f to stage-aosp-master am: 3a7443d79d am: 6890bab6d9
am: e839b247f8
Change-Id: Ic3d133e2d10255f4ffdf486642b15a7ece37aec9
Diffstat (limited to 'en/devices/tech/ota/sign_builds.html')
-rw-r--r-- | en/devices/tech/ota/sign_builds.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/en/devices/tech/ota/sign_builds.html b/en/devices/tech/ota/sign_builds.html index fbc0d718..06106755 100644 --- a/en/devices/tech/ota/sign_builds.html +++ b/en/devices/tech/ota/sign_builds.html @@ -33,9 +33,9 @@ holds true both for updating user apps by overwriting the .apk, and for overriding a system app with a newer version installed under <code>/data</code>.</li> <li>If two or more applications want to share a user ID (so they can share -data, etc.), they must be signed with the same key.</ul></li> +data, etc.), they must be signed with the same key.</li></ul> <li>OTA update packages must be signed with one of the keys expected by the -system or the installation process will reject them.</ul></li> +system or the installation process will reject them.</li> </ol> <h2 id="release-keys">Release keys</h2> |