commit 62083543fdf9b6ea24f6337c8ca055e8c9f27ec6
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Thu Dec 07 18:01:29 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Dec 07 18:01:29 2017 +0000
tree 1f0a4d04417dfe3b77168ebf58e4843a32cd5174
parent 92767a7b0578443fc61197bf055905311626b33f
parent 73fe49f4a10a0d5cee43b6a325a94f4868ed2428

Merge changes from topic "am-df6856ff968d40b4976726de4b0efa3c"

* changes:
  Merge changes from topic "am-8fc14c50dacd43e58697e6b0b7f8a60b" into marshmallow-cts-dev am: 62ab4ac6b2 am: 75ae3e1c15 am: bc663093bd am: 6be3d8b586 am: 36ff749d90  -s ours am: bacc4f4e9f  -s ours am: 0ea75493d2  -s ours am: a6a75d56c5  -s ours am: 1ddb00120b  -s ours am: f3e6f27f8a  -s ours am: bb934e3622  -s ours am: 7b83ff545b  -s ours am: 0e25d763df  -s ours am: d45e24cce0  -s ours
  DO NOT MERGE: Assert that PM requires APK to start with ZIP LFH am: 9fd663759b  -s ours am: f325b5c8f9  -s ours am: 43b8c63280 am: 3d3bcdc4ec am: ca11f4e5a8 am: 800a967dd6  -s ours am: 0b66702c5e  -s ours am: 5f3b4f3f90  -s ours am: 1305c460fe  -s ours am: c606cad06f  -s ours am: 26f6cf6ac6  -s ours am: 1a7c2340c7  -s ours am: 0676ceb0b4  -s ours am: e196428139  -s ours am: 0c1ca245ac  -s ours