OSDN Git Service

resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp
authorAlan Newberger <alann@google.com>
Sat, 20 Sep 2014 01:45:24 +0000 (18:45 -0700)
committerAlan Newberger <alann@google.com>
Sat, 20 Sep 2014 01:45:24 +0000 (18:45 -0700)
commite6f258bab71af79e2c6131afaf26def437b110c6
treefbf8cb670b5b707ec9a3c5abab9af59d831e6173
parent0f1758028c8d962cf524a9b273836ec19ca038e9
parentd0927687682a7ad433b23d25e87379177bb8edc7
resolved conflicts for merge of d0927687 to lmp-mr1-dev-plus-aosp

Change-Id: If3841e2f9946db14bef7244bd29bcd7fd11168f6
src/com/android/camera/ui/FilmstripGestureRecognizer.java
src/com/android/camera/widget/FilmstripLayout.java
src/com/android/camera/widget/FilmstripView.java