OSDN Git Service

resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Wed, 23 Jul 2014 21:28:26 +0000 (14:28 -0700)
committerMathieu Chartier <mathieuc@google.com>
Wed, 23 Jul 2014 21:28:26 +0000 (14:28 -0700)
commitb94ed50a53ecbfbd360a2771a22ec91283b9a5f3
tree6787bd2fe33fc94fbfc4896e444a0c277eb55446
parentf4afc70f8b31867587e12772465bb09489c3cebb
parent38c488bcd41ba632a646d7a1d790ec71a2fcf6fa
resolved conflicts for merge of 38c488bc to lmp-dev-plus-aosp

Change-Id: If8fbbd51232fd01a481cb47df426de169c0c830c
runtime/Android.mk
runtime/gc/heap.cc
runtime/monitor.cc
runtime/runtime.h