Merge commit 'e81dd8eb9eec5b1edd40d4846b65fb4941a1aef6' into HEAD
Change-Id: I75c6f56faab1da5c8b243bee40fbd45715cd6528
tree: 2a12ce8869289addd748e35aea0a5c30e598a9ce
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml