Add messageId null check in persistIfRequired.
am: b12b703017

Change-Id: I4b04e27d736e3e44537f0f2168f395c4fc01e7aa
tree: a175d19a67ecc3126636a1af0fb6efef97687e32
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags