| commit | 19fc59be8929a49d92e098851f944ec35ad4a4ab | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Tue Dec 06 00:24:30 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Dec 06 00:24:30 2016 +0000 |
| tree | 962e26fe196c6e88119e0289b7b5786863aee0c3 | |
| parent | 00b32e883b477bab526a6a4f4266199dcb80c2a7 [diff] | |
| parent | bf9607ba3ccd1251df75e75722d2130ac34a4c23 [diff] |
Merge "Don't allow file attachment from /data through GET_CONTENT. am: 9edf71dbe4 am: 71d1064372 am: a75020d4c7 -s ours am: b3a12a7cdf am: 933e59d184 am: 3a9c3b091b am: ec677ffff6 am: 2c60f729f2 am: e04035768d am: b81d967b38 am: 23a39141ad am: e642e8e52b am: 1e5ed29349 am: c77e795469 am: b5fb51165f" into nyc-mr2-dev-plus-aosp