OSDN Git Service

Merge "libfec: add a function to disable verity" am: c3788283d7 am: 964746605c
authorSami Tolvanen <samitolvanen@google.com>
Tue, 20 Oct 2015 21:38:10 +0000 (21:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Oct 2015 21:38:10 +0000 (21:38 +0000)
commit9abe205aed358a69e4eb25a267bc0965dd979752
treee2ff733e7b539b930fcb942b3552c560c7940b65
parentcbf03d6b6a75504ee75c9a41d0b7425586099626
parent42ca2c65b4a14ef2817e017d1203a2c3ca7a0e44
Merge "libfec: add a function to disable verity" am: c3788283d7 am: 964746605c
am: 42ca2c65b4

* commit '42ca2c65b4a14ef2817e017d1203a2c3ca7a0e44':
  libfec: add a function to disable verity