| commit | f17285c4659e859b1252f6c529018b8e79666a6d | [log] [tgz] |
|---|---|---|
| author | Igor Murashkin <iam@google.com> | Sun Sep 22 09:57:40 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Sep 22 09:57:40 2013 -0700 |
| tree | 3d144e6ca4a93c5dfb280847e29f93df30261217 | |
| parent | 7dadd1ed2f8e1820704d347044a2e36dd2ff2eac [diff] | |
| parent | 8c87117588a1158823d94dec365897d33cec59bf [diff] |
am 8c871175: am 3ba21e97: Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev * commit '8c87117588a1158823d94dec365897d33cec59bf': camera2: Rename CameraProperties to CameraCharacteristics