| commit | 6e014d74d8a93fe23cc7025891fc53a4b569b074 | [log] [tgz] |
|---|---|---|
| author | Sascha Haeberling <haeberling@google.com> | Thu Mar 20 18:01:46 2014 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 20 18:01:46 2014 -0700 |
| tree | 8e605336607e6e6effd64c47e5ed005ffaf80b1b | |
| parent | 87ae86d3eb92cec95929dd2cabf521feb4ced37b [diff] | |
| parent | de5cb2a3ac53eea54eae01268e98610aa5acdaba [diff] |
am de5cb2a3: Merge "Update processing API to support pause/resume." into gb-ub-photos-denali * commit 'de5cb2a3ac53eea54eae01268e98610aa5acdaba': Update processing API to support pause/resume.