tree e79d0c430068990dac824577e8e5ee15cc44b9f9
parent 7dc383dba648a1e44406975630a8c19c176d5105
parent 57884c7ee2835df52913a87ad90e83293c3157d3
author Adam Cohen <adamcohen@google.com> 1400289679 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400289679 +0000

am 57884c7e: Merge "Disable the folder cling in two cases" into ub-now-nova

* commit '57884c7ee2835df52913a87ad90e83293c3157d3':
  Disable the folder cling in two cases