tree 2bd720fa8644f40bc9a1832b8ad7e614398364d2
parent 48fda5f169f24afc84da3c36ddd6b8855a79de19
parent 9966429dcd99667e2308cc41863ab860f04cfc88
author Ye Wen <ywen@google.com> 1405533454 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1405477234 +0000

Merge "Messaging auto persist switch (1/4)" into lmp-dev