[automerger skipped] Mark netd_aidl_interfaces-platform-java as available to...
[automerger skipped] Mark netd_aidl_interfaces-platform-java as available to platform am: 2c6d7946 -s ours am: 408d58d2 -s ours
am skip reason: Change-Id I0bfbf822c4cd1c82408929d309938abfa147abd2 with SHA-1 2c6d7946 is in history
Change-Id: If326ec79c95ce5f85b560571d73d123c427ca081