OSDN Git Service

am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
authorMarco Nelissen <marcone@google.com>
Wed, 18 Feb 2015 00:01:16 +0000 (00:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Feb 2015 00:01:16 +0000 (00:01 +0000)
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE


Trivial merge