diff options
author | Ruben Brunk <rubenbrunk@google.com> | 2014-12-09 18:40:22 -0800 |
---|---|---|
committer | Ruben Brunk <rubenbrunk@google.com> | 2014-12-09 18:41:18 -0800 |
commit | 3b46819eb0dd9ea510619c351d7ffdc244ed511d (patch) | |
tree | 5964db1699d100f05658125056858a4b594f3eca /services/camera/libcameraservice/device1 | |
parent | be6a91d9e09ca33c9f3d7821c5809ce87dd57ae4 (diff) | |
parent | 2340e5a83402cb239934e0bf1dbe581aeea37aa5 (diff) | |
download | frameworks_av-3b46819eb0dd9ea510619c351d7ffdc244ed511d.zip frameworks_av-3b46819eb0dd9ea510619c351d7ffdc244ed511d.tar.gz frameworks_av-3b46819eb0dd9ea510619c351d7ffdc244ed511d.tar.bz2 |
Merge commit '2340e5a8' into manualmerge
Change-Id: I0299d49b7e283072fc646de717fd7c1643241984
Diffstat (limited to 'services/camera/libcameraservice/device1')
0 files changed, 0 insertions, 0 deletions