tree 50c5e9444df8896adb2dbab8d8a2834c64906c00
parent 7f4b73fb1aa9c0a8b86f9d5ab4381bdbad6d6408
parent 7904e9c2d777674adf3f71f438001824773ef323
author Dmitry Shmidt <dimitrysh@google.com> 1516918889 +0000
committer android-build-merger <android-build-merger@google.com> 1516918889 +0000

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

Change-Id: I5c05336b1899ca7f92ccd548daa5e578c0d4bd89