tree b50b7b4731776e26786422483d6c6155a48da4a7
parent 9715398c4b24edd8aea2bc2cb0f471f98fcab45b
parent ff0143d09ea06421a8e28c6c4957aebab11f8b0b
author Tao Bao <tbao@google.com> 1510271452 +0000
committer android-build-merger <android-build-merger@google.com> 1510271452 +0000

Merge "uncrypt: Move to Soong." am: 992bccfef4 am: e6250057b8
am: ff0143d09e

Change-Id: I1692679a02c12b81533598a44d87bdcaabdd24ae