tree c028bfe537607823c37e2ffc8c713c73059d3130
parent fb844a72340e91e5439408b7995e36f8ec2bbb3e
parent 1c0207537dbf20cf8f9c07056d490dc9d6edb6a8
author Adam Cohen <adamcohen@google.com> 1422685328 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685328 +0000

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

* commit '1c0207537dbf20cf8f9c07056d490dc9d6edb6a8':