OSDN Git Service

resolved conflicts for merge of ac4d0dae to lmp-dev-plus-aosp
authorBrian Carlstrom <bdc@google.com>
Fri, 5 Sep 2014 20:01:41 +0000 (13:01 -0700)
committerBrian Carlstrom <bdc@google.com>
Fri, 5 Sep 2014 20:01:41 +0000 (13:01 -0700)
commit8e7a5396c6e66f7527d76dacf6365c4ee5d116c0
treee5540b6f58f440fa681e4ceae1cb068ca5939140
parente1112baf6ba83631873dc67da5605e43ec2d5b37
parentac4d0daed3a6eb2dfaaaa72ac09ddd15008f0d82
resolved conflicts for merge of ac4d0dae to lmp-dev-plus-aosp

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