[automerger skipped] Merge "Merge Android R" am: 8808cb9b0a -s ours am: 3f1edd1986 -s ours am: ac692c878b -s ours am: 98adb587e1 -s ours

am skip reason: Change-Id I0458473bf83a3196a87e6764c345c667f3d5f663 with SHA-1 5a77711ecc is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Gallery/+/1422469

Change-Id: I1af85c2c97a48bcfc1fc105c6d23d217f7497e00
tree: da0c2851599838344810814a7073194f5fe07f31
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. CleanSpec.mk
  7. NOTICE
  8. OWNERS