OSDN Git Service

Merge "Do a TryLock when allocating a ProfilingInfo from the interpreter." am: e283588e56
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 3 Mar 2016 09:40:44 +0000 (09:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Mar 2016 09:40:44 +0000 (09:40 +0000)
commitf51df9464a91bc827c8ec4058e7695c5a1be6d31
tree00fc55f4bc6b13408720699783f4e564929242de
parenteee2a9a3602f1ebea10fd66e1f64ab43cc0f4093
parent8133a7e2d94a4ad77a4317476486dd61d1226ff5
Merge "Do a TryLock when allocating a ProfilingInfo from the interpreter." am: e283588e56
am: 8133a7e2d9

* commit '8133a7e2d94a4ad77a4317476486dd61d1226ff5':
  Do a TryLock when allocating a ProfilingInfo from the interpreter.