tree 64f61038ac7656cbdf8e7519f6068b84c1e9ef0d
parent 85cb6f2cbf4d3506a3cf423941f0e25f41f0b280
parent e903ae3fc0fc7a98bfc21129ac7ca8ee7ce98fec
author Spike Sprague <spikuru@google.com> 1398818761 -0700
committer Spike Sprague <spikuru@google.com> 1398818761 -0700

resolved conflicts for merge of e903ae3f to ub-camera-everglades

Change-Id: Ic0ea3fdfd5bad7ea3a576c3bc1ab7fddd7b557bc