| commit | 020aae74d3aa9d63a2f0fd7298552487b66d9ef5 | [log] [tgz] |
|---|---|---|
| author | nicolasroard <nicolasroard@google.com> | Thu Apr 25 08:47:11 2013 -0700 |
| committer | nicolasroard <nicolasroard@google.com> | Thu Apr 25 08:54:51 2013 -0700 |
| tree | 2a94c9ebb108258ec055de40bab7af2fc8086eaf | |
| parent | 0819a57868f0b68c9766a0115253912fb6d3c9e7 [diff] | |
| parent | 7873e5b0f4e97aaadbcbb9064f31fdba48405945 [diff] |
resolved conflicts for merge of 6cc7a476 to gb-ub-photos-carlsbad Change-Id: Ide133370403bbcc6a509aa9f064ee8da38abac25