tree c031c26592302e2c733599e23c32d213e0f7ec00
parent 20135337834a8c6bee94dd2ae45e16dc60832480
parent 7ed31a7d6ff6434a7ac858087953a8d1786d18c0
author Selim Gurun <sgurun@android.com> 1425337650 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1425337650 +0000

am 7ed31a7d: Merge "Implement stub functions"

* commit '7ed31a7d6ff6434a7ac858087953a8d1786d18c0':
  Implement stub functions