tree 12783e76e3ba7d785cae328d3373728138b9a700
parent 5f26b7dac7c702d57c044896b99f81b103624e52
parent 0af7ae496b016635724a3fa3243eb12e569bf592
author Zheng Fu <zhengfu@google.com> 1412124645 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412124645 +0000

am 0af7ae49: Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev

* commit '0af7ae496b016635724a3fa3243eb12e569bf592':
  DO NOT MERGE synchronize photo storage creation for race conditions.