From: Bart Sears <bsears@google.com>
Date: Mon, 5 Nov 2012 23:57:03 +0000 (-0800)
Subject: am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~13^2~80^2~2^2~63
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b;p=android-x86%2Fpackages-apps-Camera2.git

am 368127e5: am 3ac3cdd6: am c7536cfa: Merge "Show sync error toast only when both loading and syncing are done." into gb-ub-photos-arches

* commit '368127e5815811ffdc9181ca9ba4114c5b27a412':
---

df8605ba6ca8a3501b141f7f41ecaabc1b3a8c2b