tree a10d2b3beb0c0f196c48ebdc2d0d088551544ab8
parent 128898d7e11a48910b155e0f0f544392ff91c219
parent c6845e017a12090225eba65a3933336c7fcc10ef
author Ruthwar Kumar Ambeer <ruthwar@codeaurora.org> 1495573025 +0000
committer android-build-merger <android-build-merger@google.com> 1495573025 +0000

Merge "Consider the last inserted SIM for EmergencyAffordance" am: 65d3a457d2 am: 96926cac25
am: c6845e017a

Change-Id: Ifd84c571e83da3dca1ef87805506570e41caad16