tree b676cc16d379478e8afdf21b5e45d0f00b5ec741
parent 4cf04e2bac4145c86ad2cde1bf38ae03abbc2263
parent 135e8cb721efee9d828fc98044a9340cc354b3a4
author Sunny Goyal <sunnygoyal@google.com> 1445629306 +0000
committer android-build-merger <android-build-merger@google.com> 1445629306 +0000

Merge "Update the Launcher3 backup.proto to use the deprecated nano package." am: 54076676a5 am: 1cebcca996
am: 135e8cb721

* commit '135e8cb721efee9d828fc98044a9340cc354b3a4':
  Update the Launcher3 backup.proto to use the deprecated nano package.