tree d16ea042ceb3a5ebb043f794abf354545c9cf322
parent bda21c95d306ce48c3a405b083931e655accdeb7
parent 6550022dbafb199568af856bda200d56b5ebacbf
author TreeHugger Robot <treehugger-gerrit@google.com> 1505425821 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1505425821 +0000

Merge "Camera: synchronize access to mMemoryMap" into oc-mr1-dev