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