sqian a6e57a9647 resolve merge conflicts of 345a396c to oc-dr1-dev ... Test: I solemnly swear I tested this conflict resolution. Change-Id: I5d816e17b2c8b113d07bf5e827d8c9378af761d9 Merged-In: I5d816e17b2c8b113d07bf5e827d8c9378af761d9		2017-08-01 12:25:53 -07:00
..
1.0	resolve merge conflicts of 345a396c to oc-dr1-dev	2017-08-01 12:25:53 -07:00
1.1	RadioV1_1 VTS Tests: startKeepalive, stopKeepalive	2017-07-28 14:26:09 -07:00
deprecated/1.0	Update makefiles.	2017-05-19 15:53:53 -07:00
Android.bp	Add a new vts directory under 1.1 for radio 1.1 APIs vts tests.	2017-06-28 13:06:08 -07:00