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

update_verifier: Sync Android.mk with aosp-master. am: 5422d80961
am: ca64fa7bb9

Change-Id: I8ddc76d026d64b22fd8cbda8d9a312afd975c54c