OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 457c955 534606b)
am 534606b4: am 632c915c: resolved conflicts for merge of 780d57b8 to klp-modular-dev
authorJason Sams <jsams@google.com>
Thu, 13 Mar 2014 10:52:56 +0000 (10:52 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Mar 2014 10:52:56 +0000 (10:52 +0000)
* commit '534606b44a865874b00fba24517a8e218ec56075':
  Fix destruction issues relating to AllocationAdapter.


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help