OSDN Git Service

Merge "Fix the camera2 build and import the correct Android metadata." into ub-camera...
authorPaul Rohde <codelogic@google.com>
Tue, 24 Mar 2015 17:24:27 +0000 (17:24 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 24 Mar 2015 17:24:28 +0000 (17:24 +0000)

Trivial merge