| commit | 82cca3fb4104a5e4fd42e90f820cac765a503efa | [log] [tgz] |
|---|---|---|
| author | Zheng Fu <zhengfu@google.com> | Wed Oct 29 07:00:10 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 29 07:00:10 2014 +0000 |
| tree | 12196777fa6fd4600b7be18c0541d4ef42f9a2fa | |
| parent | 6c58db0bfa8ef510555951d0fff10b37f86e7728 [diff] | |
| parent | c08967034a040bb86e75724caf8214268aa456ec [diff] |
am c0896703: (-s ours) am 0af7ae49: Merge "DO NOT MERGE synchronize photo storage creation for race conditions." into lmp-dev * commit 'c08967034a040bb86e75724caf8214268aa456ec':