tree ab84c92c8508594c745c01e8dde5a4850f06a8da
parent 52b4d869b02200ee69a18aa84759b016709ae2a5
parent 5422d809617648dd221467fe78f0e76c27eabc30
author Tao Bao <tbao@google.com> 1479618588 +0000
committer android-build-merger <android-build-merger@google.com> 1479618588 +0000

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

Change-Id: Iac281a5f7a1a771282cdbf4503fe7e0991073624