tree 71a2304b553261c3e9425f0d6b6068835c76ac0c
parent 7d62e546b3b9eedc1f5c9d8f3ee644025f554fe3
parent 17218987cfa32cff5dc719cfb88d0e3ce3677f00
author John Hoford <hoford@google.com> 1366766222 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1366766222 +0000

Merge "interruptible renderer" into gb-ub-photos-bryce