tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent ba11e5af81c3d1f7ebd9cb404ac4df556968b924
parent a21882dcfa0786a3f54ceaa4f5d8808173c477cf
author Adam Cohen <adamcohen@google.com> 1422669706 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669706 +0000

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

* commit 'a21882dcfa0786a3f54ceaa4f5d8808173c477cf':