tree 4093f95a4dcc6027f5b3a61c72829462d6b18cae
parent 113971d383ded9e2c5cd9b324339bfafa8b9c091
parent 14e10c3b10563e68030bba002f5ee948d3b0dc91
author Erik Kline <ek@google.com> 1536656047 -0700
committer android-build-merger <android-build-merger@google.com> 1536656047 -0700

Merge "Remove services.net JAR dependency" am: 60ff003a9d
am: 14e10c3b10

Change-Id: Idfd6c7a57834441d125f605a4d3fbc1c5a5a3338