tree cba62d0d64153aa2169651696bc238591341d679
parent a5896d08fd490b351feeedc8b0f351456d84818f
parent 71d0183cd9b46877b981673f94fed1f5bf094cca
author Adam Cohen <adamcohen@google.com> 1414085547 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414085547 +0000

am 71d0183c: am 19f7dcd5: am 69a10949: Merge "Fix NPE from feedback (issue 12106858)" into jb-ub-now-kermit

* commit '71d0183cd9b46877b981673f94fed1f5bf094cca':