am a7d5d01f: Fix Android.mk
authorHengyuan Hu <hengyuan@google.com>
Sat, 18 Jul 2015 00:59:19 +0000 (00:59 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 18 Jul 2015 00:59:19 +0000 (00:59 +0000)
* commit 'a7d5d01f44b4e9c3de9965e82bd0a4503367d0b5':
  Fix Android.mk


Trivial merge