Import translations. DO NOT MERGE

Change-Id: I6d43e9331dd993de57921360e33c36a58c355056
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I122eede49de1a919508911c5439529fdda40b203
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

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

Change-Id: Ia6906f2a43e04fae3489cc3d253fa6bc5dc175f4
Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow
am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'e3336dc35f514e3b5dd7a15f9a86eaf6d1572b5e':
  Prevent lock screen appearing during active slideshow
am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c1aaf4b526507245428ef56a03727a5d0fb68659':
  Prevent lock screen appearing during active slideshow
Merge "Change the order of exposure compensation" into gb-ub-photos-bryce
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
  Change the order of exposure compensation
am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9fb962feb94909af05ab6cf872eee7e8928eb9b1':
  Change the order of exposure compensation
am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '00d9601b666106c3a1b60beb88639c70b8548ddc':
  Change the order of exposure compensation
Removed unused handling for intent extras in editor.

Bug: 9170644
Change-Id: I569b16d278d1813f5a96f9e0231ed71ff9e33687
Removed unused ZoomCache class.

Bug: 9170644

Note: this class doesn't appear to have been used by the zoom
on doubletap.

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

* commit 'f6f4abec09afda4d802ac0b7b2006d86a6161892':
am c4ef64c8: am c1aaf4b5: am e3336dc3: Merge "Prevent lock screen appearing during active slideshow" into gb-ub-photos-bryce

* commit 'c4ef64c8cc8ba7edc543f64efcb25c401cc94466':
  Prevent lock screen appearing during active slideshow
am 9e11dddd: am 00d9601b: am 9fb962fe: Merge "Change the order of exposure compensation" into gb-ub-photos-bryce

* commit '9e11dddd508dff7b8d24c56989d70c6ff67ca619':
  Change the order of exposure compensation
Fix XML comment.

Change-Id: If54672cc7cb9ad6a240bb2dff07cbe9c39a521a3
(cherry picked from commit 53a0d0aa62b5f33ca3ff2c9ec63a4bcf606c5292)
Add UI for insertion in FilmStripView.

Change-Id: Iff389525e3811c5018365b6e6c3b9f8b95b9da9a
Recover from bitmap decode failure.

 Skia errors out when decoding a bitmap into another bitmap
 sometimes. When this situation is detected, the decode is
 is retried without reusing a bitmap.

Change-Id: I935dec988ed7e115ceda9233a65d3b6083a17468