OSDN Git Service

Merge "filmstip quantumification" into ub-camera-glacier
authorSpike Sprague <spikuru@google.com>
Tue, 22 Jul 2014 18:23:05 +0000 (18:23 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 17 Jul 2014 19:20:15 +0000 (19:20 +0000)
commitdde95571f3c1ea5f733dbdcf7a8e4ffe15a83e08
tree735b12e8ce5c8ff5195766337e71f6fb5c8830d9
parent3736714d7aecbd26124e575ce84a1a34187c32b5
parent919bea1a10464f23aeb090a254ff36169d012e9a
Merge "filmstip quantumification" into ub-camera-glacier