tree de535f49f870036a4a93399b1e986baee08c8745
parent 12dcbc2115ea76443013709e66598c4fb9c79e00
parent 50b2607a5d233d8c687bca051f1d6f47ed07032f
author Pavel Maltsev <pavelm@google.com> 1525775876 -0700
committer android-build-merger <android-build-merger@google.com> 1525775876 -0700

[automerger skipped] Fix NPE during dumpsys ethernet am: af2c075443
am: 50b2607a5d  -s ours

Change-Id: I45e174b56cc74e5427d83b51b9153c15217315a9