diff options
| author | Chad Brubaker <cbrubaker@google.com> | 2016-05-23 02:45:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-23 02:45:45 +0000 |
| commit | 096367e5072389d21996c2cc734ca3b0ba740309 (patch) | |
| tree | f9d358e2750c8c14c67dd60c9b07b817ed8d4d36 /docs/html/sdk/api_diff/21 | |
| parent | 532bbd243899f520aa1319753c6c2e42430ed18b (diff) | |
| parent | 343301a6249eec9c98a57b9030ef20eed74e52ca (diff) | |
Merge "Merge "Use an attribute for the network security config resource" into nyc-dev am: 6812bdf387 am: c6a49bb008" into nyc-mr1-dev-plus-aosp
am: 343301a624
* commit '343301a6249eec9c98a57b9030ef20eed74e52ca':
Change-Id: I696845073d7d875ba183eb738e36ff735f71c17d
Diffstat (limited to 'docs/html/sdk/api_diff/21')
0 files changed, 0 insertions, 0 deletions