[automerger skipped] android_*_stubs_current modules are moved to...
[automerger skipped] android_*_stubs_current modules are moved to frameworks/base am: d061df9e am: cfc3ae2c am: aaa89d2e -s ours
am skip reason: Change-Id I6f69f7cb64a6ed3c2032a116500436eabe562dca with SHA-1 12cc1267 is in history
Change-Id: I8aa5776c9adee3435242ecc0467a00b388c0a72f