tree 145cd6c949d784c9894327fa2e479c66a54487c1
parent 22e3fb607435e2c24c9d4430a2c4b8d693e3cb80
parent 505f79c39b9ca38e2ccd8655612cd845a733ea8c
author Android Build Merger (Role) <android-build-merger@google.com> 1463422888 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1463422888 +0000

Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp