Pengquan Meng 58fed7fac6 Merge "[API feedback] api fixed for getSlotMapping" ...

am: 9931252c3f

Change-Id: I68489daa92188232f3d1489226f71c14d5b2b14d

2019-03-15 15:58:45 -07:00

..

android

Merge "[API feedback] api fixed for getSlotMapping"

2019-03-15 15:58:45 -07:00

com/android

Merge changes from topic "Porting-ONSAPIChanges"

2019-03-15 12:53:18 -07:00