tree 4d22c5b97db72645ba4f8fb52deae24404c2f1f9
parent 828081f5f947abb8930f084386492efde8c5b83b
parent 4af3ac5b6fd690c937f9602231096f26d5c936e8
author Senpo Hu <senpo@google.com> 1413334209 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1413334210 +0000

Merge "Fix the build break due to ag/567355." into ub-camera-glacier