Naveen Kalla 7e15c58085 resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp ...

Bug: 62933474
Test: Build
Change-Id: I5728fd9175cc23ec8ef62c0b645cbb3505fb76e3
Merged-In: If2b62b8148ba23840a4c018341e0fed24b41944b

2017-07-13 20:49:08 -07:00

..

android/telephony

resolve merge conflicts of b78661052c44 to oc-dr1-dev-plus-aosp

2017-07-13 20:49:08 -07:00

com/android

Merge "Prevent any app except LPA to create logical channel to AID of ISD-R." into oc-dr1-dev

2017-07-07 23:12:44 +00:00