tree 0f4e8d7156f678f34a0e28cb6cdb3ac35887792e
parent 141649b66453380a4a912f72ec765f2c1877f3e0
parent 57cc16e38e6461da4317c285eec61c3265e516bf
author Chih-Hung Hsieh <chh@google.com> 1414363660 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414363660 +0000

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

* commit '57cc16e38e6461da4317c285eec61c3265e516bf':