| commit | d88c0011ab16c2a27962249a9896835f85576794 | [log] [tgz] |
|---|---|---|
| author | Sam Judd <judds@google.com> | Mon Mar 24 10:28:52 2014 -0700 |
| committer | Sam Judd <judds@google.com> | Mon Mar 24 10:28:52 2014 -0700 |
| tree | c57eccf8fdb7cd08036427235ec0a200254cbaf7 | |
| parent | 43ea41960cb4085965608db9e19ef357d9c03efb [diff] | |
| parent | 2666dc8a1c23b7c2b7c80d7c09104f113fb7dbb2 [diff] |
resolved conflicts for merge of 2666dc8a to ub-camera-everglades Change-Id: I9e3733dc447ae6613c73c1a94e7cc3c5e400b1da