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