diff options
author | Sol Boucher <solb@google.com> | 2015-03-20 22:08:34 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-20 22:08:34 +0000 |
commit | fac872805bb2279a6f0714657caa554539ae820d (patch) | |
tree | 0fc13fd92643f45f47367ee042360cbfee28b309 /common/java/com/android/common/userhappiness | |
parent | 4f033908bd76e57ebb53c398ee56949db60a03f0 (diff) | |
parent | d90959c9fcf4ec6d6f332ab534993913538bfe38 (diff) | |
download | android_frameworks_ex-fac872805bb2279a6f0714657caa554539ae820d.tar.gz android_frameworks_ex-fac872805bb2279a6f0714657caa554539ae820d.tar.bz2 android_frameworks_ex-fac872805bb2279a6f0714657caa554539ae820d.zip |
am d90959c9: am d6a52ce7: Merge "camera2-api: Work around invalid camera2 API focus modes" into lmp-dev
* commit 'd90959c9fcf4ec6d6f332ab534993913538bfe38':
Diffstat (limited to 'common/java/com/android/common/userhappiness')
0 files changed, 0 insertions, 0 deletions