OSDN Git Service

resolved conflicts for merge of 1cfa3dd7 to ub-camera-everglades
authorAlan Newberger <alann@google.com>
Thu, 27 Mar 2014 01:31:02 +0000 (18:31 -0700)
committerAlan Newberger <alann@google.com>
Thu, 27 Mar 2014 02:08:14 +0000 (19:08 -0700)
commita293597032795e3f245e9f0d5b20701375904e04
tree7c8c5ef48ff2bd30035fd2c2419b0e573442cb70
parent2d9fb0ddb2e9d64276506281a27ef1c9a17f01d3
parent1cfa3dd77d3828985d37beffbfad9388af054757
resolved conflicts for merge of 1cfa3dd7 to ub-camera-everglades

Change-Id: I82bd27a28ad5df4dda149e97bddc317ffe6914d0
res/layout/filmstrip_video.xml
src/com/android/camera/data/LocalMediaData.java
src/com/android/camera/data/LocalSessionData.java