OSDN Git Service

am d12bbb8a: am 6a42c3ae: Add a null check to fix NPE
authorztenghui <ztenghui@google.com>
Mon, 11 Nov 2013 17:00:01 +0000 (09:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Nov 2013 17:00:01 +0000 (09:00 -0800)
* commit 'd12bbb8a7ba13fb9e743b62fc9d9779517b8d43e':
  Add a null check to fix NPE


Trivial merge