OSDN Git Service

Merge "Fix a mistake of CameraAgentFactory's recycle();" am: c7a2095139 am: 3a06cce41f
authorChao Zhang <ZhangCharles518@gmail.com>
Tue, 29 May 2018 19:49:52 +0000 (12:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 29 May 2018 19:49:52 +0000 (12:49 -0700)
commit325aca4672365fc46b7456941072b15c5f3627df
treebd9753bbcc29041c74331708edc3775bab797712
parent0a77a93eb38aeab2b1ac2c3866a32301d874db48
parent4d50f1dec819dc5d9277710f543f9a07a9d6e690
Merge "Fix a mistake of CameraAgentFactory's recycle();" am: c7a2095139 am: 3a06cce41f
am: 4d50f1dec8

Change-Id: I3f8839b5a4b00bf2818f07fede3a301389f17e49
src/com/android/camera/settings/CameraSettingsActivity.java