tree 8d70ed14773f27a40b58a7eead544b2669b9c9fc
parent ce0b6cee074d3a0ab0d9e8829892be2bbbf35d25
parent 8335d8b2ef4d22dcaccda9726c3a1460be2bd86c
author Chih-Hung Hsieh <chh@google.com> 1414363717 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414363717 +0000

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

* commit '8335d8b2ef4d22dcaccda9726c3a1460be2bd86c':