| commit | 355148659ec47dcbc0e670da3d38b7590e33d366 | [log] [tgz] |
|---|---|---|
| author | ztenghui <ztenghui@google.com> | Thu May 09 09:27:04 2013 -0700 |
| committer | ztenghui <ztenghui@google.com> | Thu May 09 09:27:04 2013 -0700 |
| tree | ecb23690e3f778df8f53f2c7599a96fc170bdaf8 | |
| parent | 1e9c9667ca0cc86f2752a42947eb2b02dc099ee8 [diff] | |
| parent | 4b04581a65df77b3e3d29fe740411216ec2d079f [diff] |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39