OSDN Git Service

resolved conflicts for merge of 223390fd to lmp-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 11 Sep 2014 09:26:01 +0000 (11:26 +0200)
committerSebastien Hertz <shertz@google.com>
Thu, 11 Sep 2014 09:26:01 +0000 (11:26 +0200)
commite2dd5df508669ee3743138fc35893001cde4fe11
treec924cde1beaab5180a496616128678dc7784ac52
parentf8459df0dec144090c712f690f6b3c17e65ff40f
parent223390fd81f6bcff0811e5d5fee98948181fe7b3
resolved conflicts for merge of 223390fd to lmp-dev-plus-aosp

Change-Id: I889e3e4b1bf9ac5a699c962341d71633294b40c6
runtime/debugger.cc
runtime/jdwp/object_registry.h