tree 35fe1e02eb2f83c7bab54ce9bc5a51a00df2a3ce
parent d4dddee4c3ced6996cadd7f34bd2e34f482dc9d2
parent 5ad6f8ed1899fdb512d99cf6ad1955d774a6f3c8
author Jorim Jaggi <jjaggi@google.com> 1412960452 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412960452 +0000

am 5ad6f8ed: am 50398f12: Merge "Don\'t use SRC optimization on manta" into lmp-dev

* commit '5ad6f8ed1899fdb512d99cf6ad1955d774a6f3c8':
  Don't use SRC optimization on manta