| commit | e579e4f752af8005680a4b80780ba65a7fdfa9e8 | [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 | cc6dd6f1a8f52a10d197336c49176977096c2ee4 | |
| parent | bf1dc5019c3040e2380a1695f4a5ac8ac6aafd26 [diff] | |
| parent | b5530eae0732be37a7685e646c5dd9726dc73caf [diff] |
resolved conflicts for merge of 9a4fb2dc to gb-ub-photos-carlsbad Change-Id: I90ffd8732cf34bb3dea7a849fc37fb1f3d82df39