tree dca58875dd338bc696afde96ff6ca5d1a08710ec
parent 059b8ab6a9444b1dbdfcdc1df50485dfac7adafa
parent 6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd
author Benjamin Franz <bfranz@google.com> 1422269714 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422269714 +0000

am 6d16b861: Merge "Avoid NullPointerException if createUser returns null" into lmp-mr1-dev

* commit '6d16b8614ac4c5aa44304e6fdcb9ed8aeec675fd':
  Avoid NullPointerException if createUser returns null