tree 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e
parent 6227b1ce18f7a45203a72102b75f891eddc8d7d1
parent a66efb5d9a21e2666099dffb234b774d796cefbd
author Chih-Hung Hsieh <chh@google.com> 1413493378 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413493378 +0000

am a66efb5d: Merge "Add -no-integrated-as at local level."

* commit 'a66efb5d9a21e2666099dffb234b774d796cefbd':
  Add -no-integrated-as at local level.