OSDN Git Service

am 49f91878: am da03242f: Merge change 24840 into eclair
authorSan Mehat <san@google.com>
Thu, 17 Sep 2009 01:19:52 +0000 (18:19 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2009 01:19:52 +0000 (18:19 -0700)
Merge commit '49f9187825d898e1b696449a0162fa8a616e0ba0'

* commit '49f9187825d898e1b696449a0162fa8a616e0ba0':
  dalvik: Switch to common cutils sched_policy api

1  2 
vm/Thread.c
vm/Thread.h
vm/alloc/Heap.c

diff --cc vm/Thread.c
Simple merge
diff --cc vm/Thread.h
Simple merge
diff --cc vm/alloc/Heap.c
Simple merge