OSDN Git Service

am 0ed25174: Merge "Camera2: Update java doc for tone.map.curveRed key"
authorZhijun He <zhijunhe@google.com>
Tue, 18 Feb 2014 19:12:27 +0000 (11:12 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 Feb 2014 19:12:27 +0000 (11:12 -0800)
* commit '0ed25174f98fe473990b1d3298540117d8158e93':
  Camera2: Update java doc for tone.map.curveRed key


Trivial merge