am 42423914: am 5c95e49f: am 75084da1: Merge "toUpper() some strings" into gb-ub-photos-bryce

* commit '4242391413fe3b5e12502794cefc7caf689e3044':
  toUpper() some strings
am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '5f30afbeea7d6f6f05df9e8a50b64c5cd0cc9cca':
  Add new overlay icons for sharpen and curves
Add new camera activity back and fix build errors

Change-Id: I30b657c7eee2b8cb0317c922966821002ea956f0
am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '1420dea329586ad491ea93a90a59d0d78b28d953':
  Add new overlay icons for sharpen and curves
am 6d86f3d3: am 1420dea3: am 5f30afbe: Merge "Add new overlay icons for sharpen and curves" into gb-ub-photos-bryce

* commit '6d86f3d361d28679cfe5da08dcb7f4356f13558a':
  Add new overlay icons for sharpen and curves
am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '3b7347daf572c20996607afe4cc32f9a96f8fe5d':
  Switch back to old crop
am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '8d07b582341df0262eda91da7fbed5938bdd2337':
  Switch back to old crop
am 72b6bd03: am 8d07b582: am 3b7347da: Merge "Switch back to old crop" into gb-ub-photos-bryce

* commit '72b6bd030c21553f32073790ac8276111ac4e684':
  Switch back to old crop
Merge "Add new camera activity back and fix build errors" into gb-ub-photos-carlsbad
Add remove UI in FilmStripView

1. Add UI support for swipe to delete.
2. Don't set children padding.

Change-Id: I26be97f14d569db3df6a127cd00efe3c0c60f22c
Import translations. DO NOT MERGE

Change-Id: I963773d748c0ee9d23257f3fb688f8921a97f01b
Auto-generated-cl: translation import
Reconcile with jb-mr2-release - do not merge

Change-Id: I6c8f974fdf7022bfe1cc0ca00a3cf1466d641428
am aecc1998: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit 'aecc1998647fc33822a8e5c55673c8f45ec466e7':
am 1a266f16: Highlight selected option in FX and Borders

* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
  Highlight selected option in FX and Borders
am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders

* commit 'cf4b66a9a4d794d93c75798fab81fad006897167':
  Highlight selected option in FX and Borders
am 34243e8f: am cf4b66a9: am 1a266f16: Highlight selected option in FX and Borders

* commit '34243e8ff2784c9d2ee9b72cf6c4ec54b7f65a42':
  Highlight selected option in FX and Borders
Merge "Import translations. DO NOT MERGE"
am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '082541a730e56092b948580a8e8040be78979e23':
  Import translations. DO NOT MERGE
am 2e4c852c: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit '2e4c852c525ceceb7176f61e1d94a4fed9b29d15':
  Import translations. DO NOT MERGE
am 5ba97880: am 082541a7: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '5ba9788055cce978a82a96367625b671471a86f4':
  Import translations. DO NOT MERGE