Merge "Snap for 11400057 from d53945b296ffabbf7f95203867ed0173b7ad834b to simpleperf-release" into simpleperf-release
tree: e4b96a4e9a55ca09a40ec385e89b9300c5e55684
  1. art/
  2. res/
  3. src/
  4. Android.bp
  5. AndroidManifest.xml