tree 62a719c10027256c726804c0b22b381c3126bf58
parent 80e694717d05b2da3843c8bf80040755b0a8e89d
parent 7e69f0b36165aab7adcfb0fec93059f1c96cb053
author Kris Giesing <kgiesing@google.com> 1426783901 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426783901 +0000

am 7e69f0b3: am 6ef613ed: Merge "Initial implementation of GuidedStepFragment" into lmp-mr1-ub-dev

* commit '7e69f0b36165aab7adcfb0fec93059f1c96cb053':
  Initial implementation of GuidedStepFragment