tree a4f0aeb13109ef82aec3def46209cbaa6928e0f6
parent 0dd862333c99f99bc0c7a236a0f59ca665d21566
parent e574888a609b7a36c059fab4cdcfab90fe948f9c
author Vladislav Kaznacheev <kaznacheev@google.com> 1461275290 +0000
committer android-build-merger <android-build-merger@google.com> 1461275290 +0000

Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev am: 729c640cc8
am: e574888a60

* commit 'e574888a609b7a36c059fab4cdcfab90fe948f9c':

Change-Id: I99ba69682f763583611b6006db22f5d7c43811cf