OSDN Git Service

resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali
authorIgor Murashkin <iam@google.com>
Fri, 18 Oct 2013 21:36:13 +0000 (14:36 -0700)
committerIgor Murashkin <iam@google.com>
Fri, 18 Oct 2013 21:36:13 +0000 (14:36 -0700)
commitbf2c3edea9c0ae650cacc03f6d68941066315d05
treecad9de68147773bd0d9c2c6540dbb68544683147
parent5e28cb9249d7fe71e5a07988dcbc892ac6f24f84
resolved conflicts for merge of d3e75bd7 to gb-ub-photos-denali

Change-Id: I32ca2adf683b9e479b3925956e5c3030e9692cbd
src/com/android/camera/util/CameraUtil.java