tree dc1da7e301f3b36ff024101877c646bb90a6a179
parent c74ed0d6dc0bed7b778921faa6d1fe4801d5cb2f
parent 6aa504077d2dc8ff4b62a85501fc1a99c55b7fc5
author Steve McKay <smckay@google.com> 1468974734 +0000
committer android-build-merger <android-build-merger@google.com> 1468974734 +0000

Merge \"Make the app name \"Files\" instead of Documents.\" into nyc-mr1-dev
am: 6aa504077d

Change-Id: Ifd6e962abbcc2fb71bb1cc3239a96d8d9e027dba