tree 3895496fe048b151ca4b9d08554148f911afaf03
parent 5b5f180cfcfe6a5f304dbe788cd9aa3c1fa85f8e
parent 2634f01e2cd3ec949cd4c3b566cb3e96b3b130c3
author Dake Gu <dake@google.com> 1459552398 +0000
committer android-build-merger <android-build-merger@google.com> 1459552398 +0000

Merge "GuidedStep: Fix addAsRoot() restoring problem" into mnc-ub-dev
am: 2634f01

* commit '2634f01e2cd3ec949cd4c3b566cb3e96b3b130c3':
  GuidedStep: Fix addAsRoot() restoring problem

Change-Id: I0cdba20ec44676c44aeab8796a763cfdd0d96842