tree 07a5134bdf455603f09bfc9adf8f62b91661398d
parent 8551bfb04385781c3b8c68afaf9c055c22a4e985
parent afd37c429b14d63ee4144f00cf1fb8041f681f68
author Dmitriy Ivanov <dimitry@google.com> 1404342964 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404342964 +0000

am afd37c42: Merge "Build fix"

* commit 'afd37c429b14d63ee4144f00cf1fb8041f681f68':
  Build fix