tree 5c4403c17f5731dc1d449ae4b4ec4f47b834985d
parent dace26c42bf577818a30e559d64f182cb0fc85fc
parent 0d2adfbbb3b2f2990fc2265dfadca0252a5b4bb5
author Adam Cohen <adamcohen@google.com> 1409790877 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409790877 +0000

am 0d2adfbb: Potential fix for a couple bugs

* commit '0d2adfbbb3b2f2990fc2265dfadca0252a5b4bb5':
  Potential fix for a couple bugs