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