tree c5c1e7ab59f35d76bbe1d20cc2cd0695cded34c7
parent f2b1307bae364899b16c73a3a26b4f19409b0446
parent 723b5d505f286ce1704f8f8b316d47270f99b1e8
author Tao Bao <tbao@google.com> 1479619114 +0000
committer android-build-merger <android-build-merger@google.com> 1479619114 +0000

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

Change-Id: I7fed34988f078c6136bb0c028b7cc14b63ca31f6