tree 50c5e9444df8896adb2dbab8d8a2834c64906c00
parent 619653d7b1f65a48cb0698532296b7b7ce5f9b69
parent 8a08d159fddb864c2619787d6a43563fd4d27b54
author Dmitry Shmidt <dimitrysh@google.com> 1516920974 +0000
committer android-build-merger <android-build-merger@google.com> 1516920974 +0000

Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7
am: 8a08d159fd

Change-Id: Id6d08971d1625c0f57143a1d2f33228735d3915b