tree 0a00c5e602e6bb1332c5c8cd85349baa806173c0
parent a4d0ef3c84cb5a9951d7d967c2c99d54d573f927
parent 6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496
author Huy Nguyen <huynguyen@google.com> 1395277976 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395277976 +0000

am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

* commit '6cb8ae4c16cb3b0105ebfbb23be23e0fb1131496':
  Disabling cling when the user moves the folder before launching it. (Bug 12963868)