tree 14e7244d240181ef5ba2e54103b482d44b124d73
parent 35be8b1d52d09d74dc1461f07003d0cca6a7707f
parent 2b928f1c6afae494ee131d2b740b6df6589c466a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579142285 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1579142285 +0000

[automerger skipped] Merge "Migrate convertHalCellIdentityToCellIdentity()" am: 3149662515 am: 5e93fbb847 am: 2b928f1c6a -s ours
am skip reason: Change-Id Ibf07f770b377c383ea0c4d3ef2d1d991a37854a9 with SHA-1 f55983a5d5 is in history

Change-Id: I6d689c08cc859318b4acf7118a024e406b78d6a5