OSDN Git Service

resolved conflicts for merge of 6b8ccf42 to lmp-dev-plus-aosp
authorMathieu Chartier <mathieuc@google.com>
Sun, 14 Sep 2014 21:49:07 +0000 (14:49 -0700)
committerMathieu Chartier <mathieuc@google.com>
Sun, 14 Sep 2014 21:49:07 +0000 (14:49 -0700)
commitb8ac4940b84cba43f644c00f9df866e8068820c0
tree9bc78be32bb7d028ad3cf157e6a237b1b6bc6951
parentadeacb3796d1c9c3ebf13041f90a9d58e57c1868
parent6b8ccf42e206869ee72b4372f56a8bb636737c6e
resolved conflicts for merge of 6b8ccf42 to lmp-dev-plus-aosp

Change-Id: I88d6ab9c33c4bbec754e8ba4ce8b296b38d52a84
runtime/Android.mk
runtime/base/mutex.cc
runtime/base/mutex.h
runtime/runtime.cc