tree 95ae34fb23f20ca71547904bb6deb13397574049
parent 78e63bd64abf6b4f526828260904c616dbd8c00e
parent ed7f54883276b84b02fdba578e64a90cfc15d37b
author TreeHugger Robot <treehugger-gerrit@google.com> 1487792215 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1487792218 +0000

Merge "Rename CameraService to CameraServiceProxy"