tree 9be51182f923e1492e8d5f398c0ff4bbd906cc89
parent 2921c4d9b2921bed1dcf823b1279223ba79317fc
parent 721b107e98cd61046fa137adbd8fe82eb1147e99
author Eino-Ville Talvala <etalvala@google.com> 1359601181 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359601181 -0800

am 721b107e: (-s ours) Camera: Fix ordering of boolean enums, types for curves.: DO NOT MERGE

# Via Igor Murashkin
* commit '721b107e98cd61046fa137adbd8fe82eb1147e99':
  Camera: Fix ordering of boolean enums, types for curves.: DO NOT MERGE