| commit | da8c79d378e3a133bb88d80cf8765bb4f7507d66 | [log] [tgz] |
|---|---|---|
| author | Jason Sams <jsams@google.com> | Thu Mar 13 23:11:58 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 13 23:11:58 2014 +0000 |
| tree | 4bf123f5deaf0a702347ef63b0f398bcaa4c521b | |
| parent | 885ddcaa6df92d173a5b8798d0f37ae63ae2b6a1 [diff] | |
| parent | 4a268affbf2a15d68171036a941c2404eae07833 [diff] |
am 4a268aff: am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev * commit '4a268affbf2a15d68171036a941c2404eae07833': Fix destruction issues relating to AllocationAdapter.