OSDN Git Service

am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce
authorJohn Hoford <hoford@google.com>
Wed, 24 Apr 2013 01:22:46 +0000 (18:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Apr 2013 01:22:46 +0000 (18:22 -0700)
commit68be3944511cbd9deec7033930bc223aedf6645d
tree6a54e1e8d143876395b05505dcf3cc3860993e46
parent029e1531c0b5838397f38bc7554e2d346864b6b2
parent1648b0c40fd9d765ac1b255c03674fdc4ce70bd1
am 1648b0c4: am 0c71308c: Merge "interruptible renderer" into gb-ub-photos-bryce

* commit '1648b0c40fd9d765ac1b255c03674fdc4ce70bd1':
  interruptible renderer