tree 7991a60fac9ac5eb80954d3d435827b589e0fa00
parent 76870071565f6a26dc18d1af2c116fe61a8e541e
parent 850a7c2e7b35c456f51c267feb223557356bd063
author TreeHugger Robot <treehugger-gerrit@google.com> 1494365743 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494365747 +0000

Merge "QCamera2: Replace ATRACE_INT with ATRACE_ASYNC_BEGIN/END"