[automerger skipped] Merge "Use ApexInfo.moduleName" am: 760e80c1e9 -s ours am: a3c24462e8 -s ours
am:207dc1d938-s ours am skip reason: change_id If0bd3d368c7373ab0028211a8a4246a9821893af with SHA1b4eee2a17dis in history Change-Id: I6300194f8289e0cb7d87cc506c307531e83f39f5
This commit is contained in: