OSDN Git Service

am c1bfaa22: Remove dex2oat watchdog warning
authorBrian Carlstrom <bdc@google.com>
Thu, 4 Dec 2014 23:06:44 +0000 (23:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Dec 2014 23:06:44 +0000 (23:06 +0000)
* commit 'c1bfaa22570b4f771ae1cd832201b01ec84e32c1':
  Remove dex2oat watchdog warning

1  2 
dex2oat/dex2oat.cc

Simple merge