tree 35716aa2c5758334355ae13bf4db018f74a35cc8
parent 6743ede7859d5e7992b7bd4de0aed1790f1ee725
parent b6f30bae48ef955b75c3568055c3773600232cd0
author Garfield Tan <xutan@google.com> 1461347526 +0000
committer android-build-merger <android-build-merger@google.com> 1461347526 +0000

Merge "DO NOT MERGE: Disable drag n\' drop in DocumentsActivity." into nyc-dev am: 6e685dc3c5
am: b6f30bae48  -s ours

* commit 'b6f30bae48ef955b75c3568055c3773600232cd0':
  DO NOT MERGE: Disable drag n' drop in DocumentsActivity.

Change-Id: I4428063e93379fdfdf280cb627dc94dfc7045ef0