Merge "To prevent MMS get the incorrect resource on MSIM device" into qt-dev am: 9f67590d1b
am: fa03620c06

Change-Id: I653e706887d0737eeb96d2ef026f517657f32ba1
tree: 1b5846c83db0350ff446b0b1d0cf0134f6dd1503
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags