commit | 699143c9437107a55c7d4d9317dddd1ba2184d21 | [log] [tgz] |
---|---|---|
author | Zheng Fu <zhengfu@google.com> | Wed Oct 01 02:12:34 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 01 02:12:34 2014 +0000 |
tree | 86a1dead4b0f14088598b9de453156a2dbce366a | |
parent | 92ed54fcb2fbfe23071515a214a2bcd8626ca425 [diff] | |
parent | d0fa983ee32dffd2835bac40db4dc7fda4f9b4ad [diff] |
am d0fa983e: (-s ours) am 3c765b07: am e83d280b: am 85fa5405: am 0af7ae49: Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev * commit 'd0fa983ee32dffd2835bac40db4dc7fda4f9b4ad': DO NOT MERGE synchronize photo storage creation for race conditions.