am 48476b0a: Merge change Iab5c49c7 into eclair-mr2

Merge commit '48476b0ade7594a64612db2b867792737193b2ec' into eclair-mr2-plus-aosp

* commit '48476b0ade7594a64612db2b867792737193b2ec':
  move event log tags used by system server into this package
tree: 9c5561d81135949e05be54b057b59a406e909f27
  1. core/
  2. services/