tree 780e2714fe28b6fb9ebd559d6cd5b7b774522221
parent c3321c813c8c8c351c16b83fcf184de5840a4d93
parent 3a49ba2e402701170a61f18632652d1a9379cf15
author TreeHugger Robot <treehugger-gerrit@google.com> 1503688424 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1503688424 +0000

Merge "Fixed that the status icons were showing in the camera" into oc-mr1-dev