tree 25581ae3aca6f4e5afb406165394440a9d127e14
parent 393bd2e87a33bb785e917a810892f4a97d2dc2e1
parent fc4cf2da34335fd7e84c020f51eea1a341d3f134
author Makoto Onuki <omakoto@google.com> 1472587054 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1472587056 +0000

Merge "Shortcut: Improve backup & restore" into nyc-mr1-dev