am 324f25d9: am ed2d14c1: Merge "Fix null pointer dereference." into lmp-dev

* commit '324f25d95f9ab9cef0eca8ea12bcb4541f8c5060':
tree: 85ee24cff1a17cebae35acbac8c9c9420524a608
  1. halimpl/
  2. src/
  3. Android.mk
  4. CleanSpec.mk