OSDN Git Service

Merge "camera2: @hide android.request.frameCount" into lmp-dev
authorIgor Murashkin <iam@google.com>
Tue, 29 Jul 2014 22:03:29 +0000 (22:03 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 28 Jul 2014 22:45:16 +0000 (22:45 +0000)
commit88ea1a7d6675439ff2685c618c7144cd9c6aa478
treefdf119b3205380e20e3a987058b110f0eed21cdc
parent5cb142132b8ff5cdaf2999381f06e9eae05f9ca5
parent757ec2451b7983528e0a3594f16e9b2e834769c5
Merge "camera2: @hide android.request.frameCount" into lmp-dev
camera/docs/docs.html
camera/docs/metadata_properties.xml
camera/include/system/camera_metadata_tags.h