diff options
| author | Zhijun He <zhijunhe@google.com> | 2015-02-05 02:15:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:15:49 +0000 |
| commit | 6bafb866554a7dea0844438c27a7caea0aab83f2 (patch) | |
| tree | 417af9917f7c81a428fbd30fe3d5ffddb15d5e06 /keystore/java/android/security/KeyChain.java | |
| parent | a638c44bfc6aeb4ba625b3e706a0d525bc0b2ff7 (diff) | |
| parent | 81c80180311803d9faabc0bbd6c0813f44edcf7d (diff) | |
am 81c80180: Merge "Camera2: relax the EV compensation requirements" into lmp-mr1-dev
* commit '81c80180311803d9faabc0bbd6c0813f44edcf7d':
Camera2: relax the EV compensation requirements
Diffstat (limited to 'keystore/java/android/security/KeyChain.java')
0 files changed, 0 insertions, 0 deletions