tree a3e1944bc3aea3f56e0d3cd8934b98d961c097c6
parent 20ce0b5b5d666dd9d0ff41375623bde22670af7b
parent 5811e3fce16d2394654447ae9ee504149b7e1000
author Dmitriy Ivanov <dimitry@google.com> 1417558439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417558439 +0000

am 5811e3fc: am 5cd127d3: Merge "Fix mips build"

* commit '5811e3fce16d2394654447ae9ee504149b7e1000':
  Fix mips build