tree 79bf6c1f0488ea29bced0cdf318174dcf7a2f246
parent 6cea6748431f5ba346cbee61f569812590fa8a46
parent 49635c7147d1e71d052b80d89c69785baaee99b3
author Huy Nguyen <huynguyen@google.com> 1395333459 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395333459 +0000

am 49635c71: (-s ours) am 6cb8ae4c: Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release

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