tree 86be2e4a3f50a93a4d8a3c05edbeb7e6409e53f0
parent a38d615580db2120a6af8104edb9f86b81eadf5d
author Winson Chung <winsonc@google.com> 1336496431 -0700
committer The Android Automerger <android-build@android.com> 1336517647 -0700

Fixing NPE. (Bug 6460298)

Change-Id: I535cdcabb9121594b4a877839e8a0ef1c6b25af1