summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEino-Ville Talvala <etalvala@google.com>2012-05-30 19:12:52 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-30 19:12:52 -0700
commitac8ed11db3ccfa4f017bbb20d49c463595e6d90a (patch)
treee098ce6cea29b28a413b70f4a693f1778666f847 /services
parent191e7c5a4959e4c16154ade5d1ceb277ef31021e (diff)
parent28795d883a34f5393ff00dca0a54aca79b2607d5 (diff)
downloadframeworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.zip
frameworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.tar.gz
frameworks_base-ac8ed11db3ccfa4f017bbb20d49c463595e6d90a.tar.bz2
am 28795d88: Merge "Fix race condition with preview callback." into jb-dev
* commit '28795d883a34f5393ff00dca0a54aca79b2607d5': Fix race condition with preview callback.
Diffstat (limited to 'services')
0 files changed, 0 insertions, 0 deletions