am 7008c47d: am 00fa330e: Merge "Fix filters only + geometry only rendering" into gb-ub-photos-bryce

* commit '7008c47d83c4e02518c417b1ff3870122f4b1778':
  Fix filters only + geometry only rendering
am 1ad95b77: am a31f446d: Fix flashing on geometry preview

* commit '1ad95b778316638096d23368817c447f29c4d3f6':
  Fix flashing on geometry preview
am 6d0a2030: am 1fe1cc71: Merge "Fix memory leak in ComboPreferences" into gb-ub-photos-bryce

* commit '6d0a2030c4bdd093880f1c3c9873f7fd049ed0dc':
  Fix memory leak in ComboPreferences
am 659b1978: am 1933d8b2: Merge "Remove reference to local libraries. Make CameraTest build against the SDK instead." into gb-ub-photos-bryce

* commit '659b19785a8673448e2939409f19fd39c8b63813':
  Remove reference to local libraries. Make CameraTest build against the SDK instead.
am b344142b: am b3825a60: Merge "fix draw and curves to use FilterRepresentation" into gb-ub-photos-bryce

* commit 'b344142ba183e729cbd8470b9e29fe6882539de6':
  fix draw and curves to use FilterRepresentation
am a6a24fe6: am 933f357a: Merge "Fix Fx filters" into gb-ub-photos-bryce

* commit 'a6a24fe64957b4276f19c0a4bd884bd9332e748b':
  Fix Fx filters
am f900f22d: am 41a03af3: Add todo

* commit 'f900f22d0b836451eb11252645568407cea5a983':
  Add todo
am d9b6794e: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit 'd9b6794ef9cd126d61b8517fbb1d74f3b27d6606':
  Import translations. DO NOT MERGE
am 2ca2d0b4: (-s ours) am 728c036e: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit '2ca2d0b4214f1bdbbba0d08134fd2a9cb9a88204':
  Import translations. DO NOT MERGE
am f8109d2a: Merge "Fix build."

* commit 'f8109d2a4344ee8676b47e57a3379cf192228b66':
  Fix build.
am 97d3c00d: Merge "Switch to GalleryGoogle as default provider for RS files (from Gallery2)."

* commit '97d3c00d213d03b1a5ca527daff8a84458d096d7':
  Switch to GalleryGoogle as default provider for RS files (from Gallery2).
am 770b2fbe: am bfcc645d: Merge "Fix borders" into gb-ub-photos-bryce

* commit '770b2fbe8ddfff82db37a46e5a713c2e3b61073f':
  Fix borders
am f5e71347: am 856acb65: Cleanup

* commit 'f5e71347c6c19d418038fc491de61e5676e5e380':
  Cleanup
am 4e4ff77d: (-s ours) Merge "Import translations. DO NOT MERGE"

* commit '4e4ff77df2d9fe55cd13bc6b9dd7c64ee1ce6a30':
  Import translations. DO NOT MERGE
am ebe294e4: (-s ours) am 61f29adf: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-bryce

* commit 'ebe294e42c4f6e4a70a602d857af7cf6857d3472':
  Import translations. DO NOT MERGE
am 4d22bada: am 7d9a6595: Merge "Replace background getDrawable calls to avoid ANR" into gb-ub-photos-bryce

* commit '4d22badac1f0b81ac28e7f7a514354fb88fd069e':
  Replace background getDrawable calls to avoid ANR
am af8ffc3c: am 2db8b143: Change transition from Gallery to Filtershow

* commit 'af8ffc3c2c391fb77d084b58adb23c3e55368c7b':
  Change transition from Gallery to Filtershow
am df130325: am 6d088c52: Merge "Fix leaks / init" into gb-ub-photos-bryce

* commit 'df1303250231ebb65a0d0cc4fcd9e8f23a8c6c01':
  Fix leaks / init
am 38d71117: am 8029c856: remove slider from FX and Border UI

* commit '38d71117e7425504354b697471ca2933fe88b864':
  remove slider from FX and Border UI
am 574abbce: am 44a499a6: Fix tiny planet to work with the new framework

* commit '574abbce8ae2afc854bf7cadd5b552fef5c76f2f':
  Fix tiny planet to work with the new framework