Dianne Hackborn 655bf11de1 am 725f731c: am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo ...

Merge commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0' into kraken

* commit '725f731cb9368f52a0c6664d2961ef4340c8f7a0':
  Fix issue #2569139: Sapphire user cannot login to last.fm...

2010-04-28 13:19:25 -07:00

..

com/android/server

am 725f731c: am bc5a0328: Merge "Fix issue #2569139: Sapphire user cannot login to last.fm..." into froyo

2010-04-28 13:19:25 -07:00

Android.mk

move event log tags used by ActivityManager into this package

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