tree d39681bacc2dfb99d83b7cae6d6506feba618c5f
parent 1fcb781b39b07779e3140e4983ecd7bb7c66080a
parent ff9bf0cc0dfd5c60037620917362789db000dd57
author Yuichi Araki <yaraki@google.com> 1435795981 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1435795981 +0000

am ff9bf0cc: Merge "Fix potential NPE when proguard is on" into lmp-mr1-ub-dev

* commit 'ff9bf0cc0dfd5c60037620917362789db000dd57':
  Fix potential NPE when proguard is on