tree 54f00562c3da04e406e46f6cd9170f9f95661c55
parent 67d0f299ef0ee60c2e21150ced2e8921e7eaec3f
parent 65405378f4fd207dcd7d99916c2397a0da08438f
author Sebastien Hertz <shertz@google.com> 1425620276 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425620276 +0000

am 65405378: Merge "Follow up 137982"

* commit '65405378f4fd207dcd7d99916c2397a0da08438f':
  Follow up 137982