OSDN Git Service

resolved conflicts for merge of 6281a794 to ub-camera-haleakala
authorAndy Huibers <andyhuibers@google.com>
Mon, 8 Sep 2014 21:08:33 +0000 (14:08 -0700)
committerAndy Huibers <andyhuibers@google.com>
Mon, 8 Sep 2014 21:08:33 +0000 (14:08 -0700)
commite89b2c119e5167d1f03d207e3e6c62876b57895a
treec9152eefc1debfa4598afbfea5430d2e0578aeb7
parentf5c62537715e8ab5e586491b75e8ddff9a3d9f6a
parent6281a7942de9e55386c20c6f41bfb656b126a364
resolved conflicts for merge of 6281a794 to ub-camera-haleakala

Change-Id: Ie488ba4103bc69f5a03bff8ef9be23a93aec51f6
src/com/android/camera/one/v2/OneCameraZslImpl.java