commit | 2f9b24d9b425ab15f2330054ca8044ee6135a8a4 | [log] [tgz] |
---|---|---|
author | Ekin Oguz <ekinoguz@google.com> | Tue Dec 06 00:28:33 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Dec 06 00:28:33 2016 +0000 |
tree | 962e26fe196c6e88119e0289b7b5786863aee0c3 | |
parent | 711e3391dad97aec503d12b9de3a72d83206c202 [diff] | |
parent | 19fc59be8929a49d92e098851f944ec35ad4a4ab [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 am: 19fc59be89 Change-Id: Id97883e164f59e7adbc3edd560ee0d93ffc364e8