[automerger skipped] [SP24] Rename functions that add Entry unconditionally am: 02a6340ca0 -s ours am: effcd8d405 -s ours
am skip reason: Change-Id I801ddc49e283a254b9586700c9b597c0adb0d459 with SHA-1 e7c6c25653 is in history
Change-Id: Ib807d1cf6bf4c2a9be054bf5df7377f540201c63
This commit is contained in: