tree 10da860fcff71886af91d082e31f0e1917926848
parent 3faad1b5697d13530a27c4450382ff87c187df52
parent c665e3637b19b4d49b88d037adf5d101ab39f354
author Adam Cohen <adamcohen@google.com> 1422666495 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666495 +0000

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

* commit 'c665e3637b19b4d49b88d037adf5d101ab39f354':