OSDN Git Service

Merge changes Ia0f54124,I1e085f5e,Ic0a3ff0a,I141847df,I8ae4efa2 into lmp-preview-dev
authorEino-Ville Talvala <etalvala@google.com>
Wed, 28 May 2014 20:33:42 +0000 (20:33 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 28 May 2014 20:33:42 +0000 (20:33 +0000)
* changes:
  camera2: Update native/managed key mappings.
  Camera2: switch API interface to java classses
  Camera2: Use ColorSpaceTransform and RggbChannelVector, replace enum byte[]
  camera2: Add new metadata keys, change types for existing range keys
  Camera2: Replace int[] by MeteringRectangle

1  2 
api/current.txt

diff --cc api/current.txt
Simple merge