resolved conflicts for merge of 223390fd to lmp-dev-plus-aosp

Change-Id: I889e3e4b1bf9ac5a699c962341d71633294b40c6

diff --cc runtime/debugger.cc
Simple merge

diff --cc runtime/jdwp/object_registry.h
index 0e46d5c,34cf840..f2f43c4
--- 1/runtime/jdwp/object_registry.h
--- 2/runtime/jdwp/object_registry.h
+++ b/runtime/jdwp/object_registry.h
@@@ -94,13 -98,24 +98,24 @@@ class ObjectRegistry 
  
   private:
    JDWP::ObjectId InternalAdd(mirror::Object* o)
-       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) LOCKS_EXCLUDED(Locks::thread_list_lock_);
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
+       LOCKS_EXCLUDED(lock_, Locks::thread_list_lock_);
+ 
 -  mirror::Object* InternalGet(JDWP::ObjectId id)
 +  mirror::Object* InternalGet(JDWP::ObjectId id, JDWP::JdwpError* error)
-       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
-   void Demote(ObjectRegistryEntry& entry) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, lock_);
-   void Promote(ObjectRegistryEntry& entry) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, lock_);
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
+       LOCKS_EXCLUDED(lock_);
+ 
+   void Demote(ObjectRegistryEntry& entry)
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
+       EXCLUSIVE_LOCKS_REQUIRED(lock_);
+ 
+   void Promote(ObjectRegistryEntry& entry)
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_)
+       EXCLUSIVE_LOCKS_REQUIRED(lock_);
+ 
    bool Contains(mirror::Object* o, ObjectRegistryEntry** out_entry)
-       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+       SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) LOCKS_EXCLUDED(lock_);
+ 
    bool ContainsLocked(Thread* self, mirror::Object* o, int32_t identity_hash_code,
                        ObjectRegistryEntry** out_entry)
        EXCLUSIVE_LOCKS_REQUIRED(lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);