summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2015-03-20 22:08:55 (GMT)
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-20 22:08:55 (GMT)
commitd419fb9326a77155326ffa4e009c48ff33c5f2f4 (patch)
tree0fc13fd92643f45f47367ee042360cbfee28b309
parentc0cf6e7c4c0bcaf9c42ba5061541463b4051fe4e (diff)
parent9d283076744f1d8f5166476b747f23c3bc443aba (diff)
downloadandroid_frameworks_ex-d419fb9326a77155326ffa4e009c48ff33c5f2f4.zip
android_frameworks_ex-d419fb9326a77155326ffa4e009c48ff33c5f2f4.tar.gz
android_frameworks_ex-d419fb9326a77155326ffa4e009c48ff33c5f2f4.tar.bz2
am 9d283076: am 06b23bb5: Merge "Camera2: Update for camera2 API changes" into lmp-dev
* commit '9d283076744f1d8f5166476b747f23c3bc443aba':
0 files changed, 0 insertions, 0 deletions