OSDN Git Service

am 5cef93f1: am dd19c33c: Merge "fixing mode -> color mapping" into ub-camera-glacier
authorSpike Sprague <spikuru@google.com>
Fri, 15 May 2015 17:18:01 +0000 (17:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 15 May 2015 17:18:01 +0000 (17:18 +0000)
* commit '5cef93f14acf2c774c94ecaf27f01d3e7db29352':


Trivial merge