tree 921c186f2fb2ea055c87c4753dc5288650954d50
parent e20c4aa8165cd7d4ffc5f3f216bae08d46c9834b
parent 2b0857a5d84c565c73e2b18c8b191984d272ac47
author Winson Chung <winsonc@google.com> 1294164734 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1294164734 -0800

Merge "Fix NPE when running on Passion device."