tree ab84c92c8508594c745c01e8dde5a4850f06a8da
parent ca64fa7bb9fa40b8afe2104a75526e0c5f584a63
parent ad57e2ca2cd4c1ad832098c30a9d595611e4e3d9
author Tao Bao <tbao@google.com> 1479618589 +0000
committer android-build-merger <android-build-merger@google.com> 1479618589 +0000

Merge "update_verifier: Sync Android.mk with aosp-master." into stage-aosp-master
am: ad57e2ca2c

Change-Id: I5ad7c0763284e32952c9b7953e526ec2d8e1aed9