| commit | db1c885d3f9d9cba36bacb1a3edcafd162ab9ca8 | [log] [tgz] |
|---|---|---|
| author | Tavis Bohne <tbohne@google.com> | Mon May 16 18:23:50 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Mon May 16 18:23:50 2016 +0000 |
| tree | 145cd6c949d784c9894327fa2e479c66a54487c1 | |
| parent | 6998dc502517f3400ec66e2dda7a0e5459eea01b [diff] | |
| parent | d935ffe46778d26070ded89782853dd1ae59cc52 [diff] |
Merge "Merge "Messaging doesn\'t allow sharing of its own files" into nyc-dev am: ca5fc9fa7d am: 0566cc6b9a" into nyc-mr1-dev-plus-aosp am: d935ffe467 * commit 'd935ffe46778d26070ded89782853dd1ae59cc52': Change-Id: I9a92aecb91d7dd4209a3128e418e2695017ab88c