[automerger skipped] Merge "Convert Android.mk to Android.bp for net cts" into qt-dev am: 10b4eaa6f0 am: 8f58b93e39
am:cc76120fcc-s ours am skip reason: change_id I5bb6de7a07494bd13d069212223691968d4f080e with SHA1db29b055d9is in history Change-Id: I5a5c2f5acce645ad11937bd4bcbb86342e7092f1
This commit is contained in: