summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSol Boucher <solb@google.com>2015-03-20 22:08:43 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:08:43 (GMT)
commit6e5595c17b70c7691335fde6a4b6ec09dcdf6d33 (patch)
tree0fc13fd92643f45f47367ee042360cbfee28b309
parent5c140a976eabff02a85b38494b2fc2b4f5f194ac (diff)
parentd500784b9bdca48d19604bb4cebe84ea08c88a90 (diff)
downloadandroid_frameworks_ex-6e5595c17b70c7691335fde6a4b6ec09dcdf6d33.zip
android_frameworks_ex-6e5595c17b70c7691335fde6a4b6ec09dcdf6d33.tar.gz
android_frameworks_ex-6e5595c17b70c7691335fde6a4b6ec09dcdf6d33.tar.bz2
am d500784b: am 47a01cf0: Merge "camera2-portability: Fix and document obscure state machine bug" into lmp-dev
* commit 'd500784b9bdca48d19604bb4cebe84ea08c88a90':
0 files changed, 0 insertions, 0 deletions