tree fbf8ab00d518f3fbeef22387e7572ed8cfb85520
parent 9f9dea0b435271fe0d931a8ab52888c58c994078
parent 46c7b6bf5f8f696f0f7275bca8d9f562e4f90911
author Ta-wei Yen <twyen@google.com> 1464382187 +0000
committer android-build-merger <android-build-merger@google.com> 1464382187 +0000

Merge "DO NOT MERGE Fix: Send Deactivate SMS after Native VVM deactivation" into nyc-mr1-dev
am: 46c7b6bf5f

* commit '46c7b6bf5f8f696f0f7275bca8d9f562e4f90911':
  DO NOT MERGE Fix: Send Deactivate SMS after Native VVM deactivation

Change-Id: I7430c85146d939330a89c3702b6bad7cfeef690d