From: Tor Norbye <tnorbye@google.com>
Date: Mon, 23 May 2011 18:27:44 +0000 (-0700)
Subject: Merge "NPE safeguard"
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1f03a6d703421d94c392c5afc74f7036d4c71167;p=android-x86%2Fsdk.git

Merge "NPE safeguard"
---

1f03a6d703421d94c392c5afc74f7036d4c71167