OSDN Git Service

resolved conflicts for merge of 364a2677 to master
authorEino-Ville Talvala <etalvala@google.com>
Fri, 28 Jun 2013 16:47:36 +0000 (09:47 -0700)
committerEino-Ville Talvala <etalvala@google.com>
Fri, 28 Jun 2013 16:47:41 +0000 (09:47 -0700)
commit25d729c3aba847cb4b56b1e6ca143410faca76c8
tree7f65dbe0d8b496541782f55b8682fdb01a03c08a
parent7919fa2c33b1fa7f5e49b2188d671bfe519c231e
parent364a2677c862af64f21b41dd3ab1b9e5c68b4ce0
resolved conflicts for merge of 364a2677 to master

Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d
services/camera/libcameraservice/Camera2Client.cpp
services/camera/libcameraservice/camera2/CallbackProcessor.cpp