tree 6843d78c71e821faa436347ba29c3523225e27d3
parent bc04a28238082241973fce57a7c3fe2cb2bccd9e
parent b0d95c4bb81bb19b61ba134dae4e832689b9feb1
author Dmitry Shmidt <dimitrysh@google.com> 1516931182 +0000
committer android-build-merger <android-build-merger@google.com> 1516931182 +0000

Merge "camera 3_4: Fix compilation errors" am: 7904e9c2d7 am: 8a08d159fd
am: b0d95c4bb8  -s ours

Change-Id: I3fc0bd56305642281b92a0c7c9791ec4e9d33bea