OSDN Git Service

am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 10:50:15 +0000 (10:50 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 10:50:15 +0000 (10:50 +0000)
commit534606b44a865874b00fba24517a8e218ec56075
treed5046b0b305b80c112706fc3af488f0090637bc7
parent2ffcffd046e321b871a04480552cef6ee4735e62
parent632c915ce8675033bbb7d356239d16594b26dffb
am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev

* commit '632c915ce8675033bbb7d356239d16594b26dffb':
  Fix destruction issues relating to AllocationAdapter.