tree e79d0c430068990dac824577e8e5ee15cc44b9f9
parent 1a86ac56d73762773d67a85ebe0c33faddcc4798
parent 6268f2db4c129e33d8d77513cb9df0f4799c7520
author Adam Cohen <adamcohen@google.com> 1400289524 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1400289524 +0000

Merge "Disable the folder cling in two cases" into ub-now-nova