Merge commit 'eaca4ef' into merge2
tree: f4dc93bb9d82c4a022ece05aecc6e40327623310
  1. gki/
  2. system/
  3. Android.mk
  4. CleanSpec.mk
  5. MODULE_LICENSE_APACHE2
  6. NOTICE