| commit | 1a4e2ec8f92716630c653f5cbb0c2ea9a154e030 | [log] [tgz] |
|---|---|---|
| author | John Hoford <hoford@google.com> | Wed May 01 13:19:06 2013 -0700 |
| committer | John Hoford <hoford@google.com> | Wed May 01 13:19:06 2013 -0700 |
| tree | 0c87ed5a5cef9788206b509231d2e410c2f88db9 | |
| parent | 2ddb3e6dc31c9ebdae1962edf1ba3fa4d498bbc3 [diff] | |
| parent | 2ef853833a2d7fed29b3a46e526fb8479422064e [diff] |
resolved conflicts for merge of d6edcee3 to gb-ub-photos-carlsbad Change-Id: I24057e85ca5b0409e9bcb92c85577fb9a763fbe4