OSDN Git Service

resolved conflicts for merge of 052c87cd to lmp-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Tue, 26 Aug 2014 14:42:28 +0000 (16:42 +0200)
committerSebastien Hertz <shertz@google.com>
Tue, 26 Aug 2014 14:42:28 +0000 (16:42 +0200)
commit680950c69b040fec6ffd7b4dbe7cb651ad56e198
tree691ab759cd155dc32bc2c0eefa58068d214dc070
parent7550a90f5bbf0781e303ab46480451bf54746099
parent052c87cd8a6c71bdf02e89aa0f1c6c3127da8d12
resolved conflicts for merge of 052c87cd to lmp-dev-plus-aosp

Change-Id: I8dcfe972e209996d26f9ac9c2028a0d6146fec1b
runtime/base/mutex.cc
runtime/base/mutex.h
runtime/debugger.cc
runtime/thread_list.cc