tree 8d70ed14773f27a40b58a7eead544b2669b9c9fc
parent bb0dc153d1fae6e9fce075cc6a2019f3a478374b
parent a4d929e3adc82981f7378933e9343a82d99fd867
author Chih-Hung Hsieh <chh@google.com> 1412892647 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412892647 +0000

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

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