tree de87ddce603863bda5d425d219a6f6dda30a9f03
parent 9160410e40c8e060a7012a35b38f2532fa159084
parent d5bc834f413d08c6c9db89b0d27e636361661d51
author Michael Jurka <mikejurka@google.com> 1350663078 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350663078 -0700

am d5bc834f: am 964e2a63: Merge "Fix NPE" into jb-mr1-dev

* commit 'd5bc834f413d08c6c9db89b0d27e636361661d51':
  Fix NPE