tree d0ab2f337d0690ba21c79965334732f37bb05ca5
parent 6ade0417485d964f8a9462105e6507bfb7d19914
parent 6b8feeedf65351fd78509bbb89b806c04f8939ca
author Chih-Hung Hsieh <chh@google.com> 1413496040 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1413496041 +0000

Merge "Add -no-integrated-as at local level."