tree 441ca9a473b409bfe1c89324c0c08129160b0542
parent 7fca5e3ec33f7d9c0e494b86e55ecde8bf7b256a
parent 8389210d541da26b553439ea3efecfd50f9b2310
author Chih-Hung Hsieh <chh@google.com> 1412788578 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412788578 +0000

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

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