OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d5db7a1 0371fd0)
am 0371fd02: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 20 Mar 2013 16:46:48 +0000 (16:46 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Mar 2013 16:46:48 +0000 (16:46 +0000)
* commit '0371fd021f2f445b4041dc38f91ec25f10253455':
  am 7212ff29: am 20e154f1: Merge "Second try at adding a compatibility symbol for the MemoryBase constructor."
  size IMemoryHeap properly for screenshots


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