tree 9ed6e130d348a2b3794f8d50d145992c16579a99
parent 3a43e9f5dbc129bdac5ca3397699a5c94dfd131d
parent 5cd127d3aa4a2f225be202af01581838fdd3c721
author Dmitriy Ivanov <dimitry@google.com> 1417556577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417556577 +0000

am 5cd127d3: Merge "Fix mips build"

* commit '5cd127d3aa4a2f225be202af01581838fdd3c721':
  Fix mips build