tree bd9753bbcc29041c74331708edc3775bab797712
parent 0a77a93eb38aeab2b1ac2c3866a32301d874db48
parent 4d50f1dec819dc5d9277710f543f9a07a9d6e690
author Chao Zhang <ZhangCharles518@gmail.com> 1527623392 -0700
committer android-build-merger <android-build-merger@google.com> 1527623392 -0700

Merge "Fix a mistake of CameraAgentFactory's recycle();" am: c7a2095139 am: 3a06cce41f
am: 4d50f1dec8

Change-Id: I3f8839b5a4b00bf2818f07fede3a301389f17e49