Android 5.1.0 release 3
merge in lmp-mr1-release history after reset to lmp-mr1-dev
tree: ecc6497c401befd1e82845564a0111d06fdaac00
  1. JustForUs/