tree 5c4403c17f5731dc1d449ae4b4ec4f47b834985d
parent d95ba882b12dbeaf8d60cf887e6b489900c94048
parent c665e3637b19b4d49b88d037adf5d101ab39f354
author Adam Cohen <adamcohen@google.com> 1409911313 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1409911313 +0000

am c665e363: am 0d2adfbb: Potential fix for a couple bugs

* commit 'c665e3637b19b4d49b88d037adf5d101ab39f354':
  Potential fix for a couple bugs