am bd20bf7b: am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev automerge: e5e43e9
am bd20bf7b: am 7658f0ed: Merge "Teach bmgr that "android" is a valid package name" into lmp-mr1-dev automerge: e5e43e9

* commit 'bd20bf7b80b115bf64d892f52c2c9c21f8a3cd64':
  Teach bmgr that "android" is a valid package name

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base