diff options
author | Igor Murashkin <iam@google.com> | 2013-09-22 16:54:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-22 16:54:11 +0000 |
commit | 3ba21e979524367631de70dfc82075693d9c616d (patch) | |
tree | 45a54d6ee51f8462c08c1bbf0f23423262a3f9da /core/java/android/content/ContentProviderClient.java | |
parent | 0983eadff23bfc3ab7812be455d4a66edc3dcc7b (diff) | |
parent | 68f40066c914aefc1f88819dd46dd1135fb9f5bc (diff) | |
download | frameworks_base-3ba21e979524367631de70dfc82075693d9c616d.zip frameworks_base-3ba21e979524367631de70dfc82075693d9c616d.tar.gz frameworks_base-3ba21e979524367631de70dfc82075693d9c616d.tar.bz2 |
Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
Diffstat (limited to 'core/java/android/content/ContentProviderClient.java')
0 files changed, 0 insertions, 0 deletions