commit | e33e3122ef829caf74a15b28a15e1ac7d5c1dd7b | [log] [tgz] |
---|---|---|
author | Zhijun He <zhijunhe@google.com> | Mon Jun 23 19:41:35 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 23 19:41:35 2014 +0000 |
tree | 7f7e31c000c122338b27efc695fe71f5b3cd454c | |
parent | b4a1896cc085c6908f6c5b06fc9d8f2fe4f8b27a [diff] | |
parent | 44aacce1e8de2a82c69fa0e0293d26acd32824ae [diff] |
am 44aacce1: am 400bcf43: am 0cc7337b: am 020e6d9b: Merge "camera2: Add updateCaptureRequest method" into klp-dev * commit '44aacce1e8de2a82c69fa0e0293d26acd32824ae':