diff options
| author | Robin Lee <rgl@google.com> | 2017-03-30 17:39:56 +0100 |
|---|---|---|
| committer | Robin Lee <rgl@google.com> | 2017-03-30 17:39:56 +0100 |
| commit | 913554a06818f44dc5fd0fb77673f8fd0e2d32d2 (patch) | |
| tree | c0a036a08e73e12d6032971679702ba1b6da9d0a /docs/html/sdk/api_diff/11/changes | |
| parent | 8637cbeac59ea76e3009760d7bf24eaa61d64b13 (diff) | |
| parent | 943187668c44db813e0b812468f124352dc0982d (diff) | |
resolve merge conflicts of 943187668c44 to oc-dev-plus-aosp
Test: make -j30
Test: runtest -x tests/net/java/com/android/server/ConnectivityServiceTest.java
Test: runtest -x tests/net/java/com/android/server/connectivity/VpnTest.java
Change-Id: Ib87cdb96626cd7625e15bec5e4afab12920405e9
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions