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