Nick Kralevich 321e815893 am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch ...

Merge commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c' into froyo-plus-aosp

* commit 'a2c6d5bf308181c019ade0aac6d25fe33dc3d76c':
  do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch

2010-06-10 11:50:51 -07:00

..

com/android/server

am a2c6d5bf: do not merge: cherry-picked 929b4855b8208d36272769e8eeaa6cd2823b94c0 from master branch

2010-06-10 11:50:51 -07:00

Android.mk

move event log tags used by ActivityManager into this package

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