Merge af227f82288014b580c9fc4bbc3621e3ee82cc51 on remote branch

Change-Id: I7a0eb3b7779729ef14edc9214df429b31799fee6
tree: 9981363a885e8eb64990d64091de3e5a45719543
  1. java/
  2. tests/
  3. .gitignore
  4. Android.bp