tree 12196777fa6fd4600b7be18c0541d4ef42f9a2fa
parent 6c58db0bfa8ef510555951d0fff10b37f86e7728
parent c08967034a040bb86e75724caf8214268aa456ec
author Zheng Fu <zhengfu@google.com> 1414566010 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414566010 +0000

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

* commit 'c08967034a040bb86e75724caf8214268aa456ec':