| commit | 085fc9ffa97b85b36a7368a2880e222efa0f9165 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Mon Mar 24 11:11:58 2014 -0700 |
| committer | Sascha Haeberling <haeberling@google.com> | Mon Mar 24 11:15:28 2014 -0700 |
| tree | 9a6ffcb7aa06cbdcd7659b05d09dca4a2e9fbf16 | |
| parent | d88c0011ab16c2a27962249a9896835f85576794 [diff] | |
| parent | e1cc77ad1ce8a7d4fc1447792da4667b5f2b2073 [diff] |
resolved conflicts for merge of e1cc77ad to ub-camera-everglades Change-Id: I5814d65c2dc5ae5f669881c2cf676277d1512684