tree ab84c92c8508594c745c01e8dde5a4850f06a8da
parent 8024278b58bee89482c1d5754487dd218b27218a
parent 9f4d3857042d28be5c2c2462008e9c5d257762eb
author Tao Bao <tbao@google.com> 1479618840 +0000
committer android-build-merger <android-build-merger@google.com> 1479618840 +0000

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

Change-Id: If6d2231e486ba91398ff8bef8d4f118e57c3324d