OSDN Git Service

am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2
authorChristopher Tate <ctate@google.com>
Fri, 11 Dec 2009 21:26:05 +0000 (13:26 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 11 Dec 2009 21:26:05 +0000 (13:26 -0800)
commit07c71147dda8bda9a40bea10f6029d6cfcaae00f
tree693b4fff20aaf8270fea81732015d8e8720cbb8d
parentb99349e1d33a4ab3cd03b4ca5cc495a7ae65fca1
parent09f82ec61cca00bd8b08529a94139dd6ac5cec73
am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2

Merge commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73'

* commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73':
  Fix #2320798: Device hang then runtime restart