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