Christopher Tate 09f82ec61c am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2 ...

Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp

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

2009-12-11 13:20:15 -08:00

..

com/android/server

am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2

2009-12-11 13:20:15 -08:00

Android.mk

move event log tags used by ActivityManager into this package

2009-12-04 16:36:17 -08:00