OSDN Git Service

am 77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev
authorEino-Ville Talvala <etalvala@google.com>
Tue, 19 May 2015 18:03:07 +0000 (18:03 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 19 May 2015 18:03:07 +0000 (18:03 +0000)
commitc79976ebebf86abed84ceb6afa9e154ae35e0bb7
tree17231bf7c545bc28cd5368ef16a86eadc9e45f53
parent9963c24b150cd776cd0166b145bab669dacd16ec
parent77545f6a19bda0d22e946497f29a8d191d68c212
am 77545f6a: Merge "Camera2: Add SDK annotations" into mnc-dev

* commit '77545f6a19bda0d22e946497f29a8d191d68c212':
  Camera2: Add SDK annotations