merge in jb-mr2-release history after reset to jb-mr2-dev
tree: 6fd0a882951c48ec8d21b63db5b5442b11748376
  1. hal/
  2. legacy/
  3. Android.mk