tree 4b07932a7e098bf284214776f14d5a71947b426a
parent bd4127544137ba9518f5864f911527ce86a2b8bb
parent f53716ed9e544c3042813d70383bdc23c7b00a77
author Daniel Sandler <dsandler@android.com> 1336162055 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336162055 -0700

am f53716ed: am a1f084e8: Merge "Fix NPEs in StatusBarTest." into jb-dev

* commit 'f53716ed9e544c3042813d70383bdc23c7b00a77':
  Fix NPEs in StatusBarTest.