tree 8b3a36e8b18a3e963e26c89e0b2bbf375869b904
parent 8acf85be0bccc53db78075fb7cf7f85b9706e828
parent 7112720bc6100049d24845cfbf3de69cdbd4fdeb
author John Hoford <hoford@google.com> 1366834767 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366834768 +0000

Merge "Fix local adjust" into gb-ub-photos-bryce