Address further API council comments. am: dba0e286ba

Change-Id: I7a56135b7a8ed6ffd07c22ef642bd4a65e7fa0c0
tree: 56b7bc4c8df9bc8fa219184f431f61733a65b5bf
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp