OSDN Git Service

resolved conflicts for merge of d9a043f9 to lmp-dev-plus-aosp
authorSebastien Hertz <shertz@google.com>
Thu, 11 Sep 2014 09:53:40 +0000 (11:53 +0200)
committerSebastien Hertz <shertz@google.com>
Thu, 11 Sep 2014 09:53:40 +0000 (11:53 +0200)
commit8030b0b0265bc1388f5aa9c705afaa57028de4d2
tree95892978e4747dd5fe739745fe8b802e0083eb52
parente2dd5df508669ee3743138fc35893001cde4fe11
parentd9a043f9530e22d3e83ea72254078b75fc9a5bb9
resolved conflicts for merge of d9a043f9 to lmp-dev-plus-aosp

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