tree 3aa856f99253dc935d8093f70b9b3d14453e3aa6
parent 3056cb67a4eaf1dcd87412dde946b60179326b9d
parent 148a56f156af9e6b4874ab8fe33d920a545e032b
author Daniel Nishi <dhnishi@google.com> 1467236836 +0000
committer android-build-merger <android-build-merger@google.com> 1467236836 +0000

Merge \"Update the deletion helper intent string.\" into nyc-mr1-dev
am: 148a56f156

Change-Id: I796da8879deede67d28321680b96ff890699c718