Merge commit 'goog/master' into merge_master
tree: bcc11c35ee7ad98e60f932d834da4079f37abf7c
  1. include/
  2. modules/
  3. Android.mk
  4. hardware.c
  5. MODULE_LICENSE_APACHE2
  6. NOTICE