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
Merge "Recover from bitmap decode failure." into gb-ub-photos-carlsbad
zoom to center of double tap

Change-Id: Idfc257f92dd1a97d9109b9f5325299b8e1432c37
Merge "Add UI for insertion in FilmStripView." into gb-ub-photos-carlsbad
Merge "zoom to center of double tap" into gb-ub-photos-carlsbad
merge in jb-mr2-release history after reset to jb-mr2-dev
Reconcile with jb-mr2-release - do not merge

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

* commit 'a4a4e0b3cb74f6cea857ed2c8a4315e1ffc30bac':
Merge "Fix XML comment." into gb-ub-photos-carlsbad
Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088

Change-Id: Id30e0a67d89419aeb323f43bf5e65321bf862e79
Use hyphenated path for android-support-v8-renderscript.

Bug: 9188088
Change-Id: Id435b35712fd944369b8515f7f84ea30f1eecbe3
Cleaning up ImageShow.

Bug: 9170644
Change-Id: Iab44ec425462e9afe8c104c52e4a28c4145d4690
Merge "Cleaning up ImageShow." into gb-ub-photos-carlsbad
Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
Merge "Import translations. DO NOT MERGE"
am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'b375339072a32c57ebb06523abeaebd2db29dc08':
  Import translations. DO NOT MERGE
am b3753390: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'b375339072a32c57ebb06523abeaebd2db29dc08':
  Import translations. DO NOT MERGE
am a7707160: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

* commit 'a7707160ba8d9693ffdb813e0eb2cd3f15084a7f':
  Import translations. DO NOT MERGE