tree 4751e0156cf85ff589fdc4a1aab258e09876a140
parent 59eb0f822c8ec33b8c5b97a95a170275df816d44
parent 69db30368a3d270c8cb8e0d648651fb7286263aa
author ztenghui <ztenghui@google.com> 1372282015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1372282016 +0000

Merge "Fix ambiguous naming and typo" into gb-ub-photos-carlsbad