OSDN Git Service

am 6d35b711: am 2b246048: Merge "fix calling Allocation.copyFrom without context...
authorJohn Hoford <hoford@google.com>
Tue, 2 Apr 2013 23:53:14 +0000 (16:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Apr 2013 23:53:14 +0000 (16:53 -0700)
commit20ab273b17536bbea2018fe809c1cae48b2e5951
tree298f45a6ea8f966da66c06511c9ecd44b2bb8fa6
parent143574aedfb2ca31db2bb512220c119b62fda1e6
parentb16f45c1791d8d4513da02f0a07de25ef9bbb944
am 6d35b711: am 2b246048: Merge "fix calling Allocation.copyFrom without context" into gb-ub-photos-bryce

* commit '6d35b711ff02de4a9d22cc4a913cd34ed0b1c15b':
  fix calling Allocation.copyFrom without context