tree 10da860fcff71886af91d082e31f0e1917926848
parent cdd05bcc4ea4ad25aef4532c740e68818ef74f0f
parent c5022b54272485938f2ca9d15a09627119435b6d
author Adam Cohen <adamcohen@google.com> 1414566439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566439 +0000

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

* commit 'c5022b54272485938f2ca9d15a09627119435b6d':