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:17:16 +0000 (13:17 -0700)
commita5815065ac0877add9c0db3605d27b4d6c426e61
tree1dc5a069fdd55cea054d1675a3978dc2d32f46fb
parente1112baf6ba83631873dc67da5605e43ec2d5b37
parentac4d0daed3a6eb2dfaaaa72ac09ddd15008f0d82
resolved conflicts for merge of ac4d0dae to lmp-dev-plus-aosp

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