Rajeev Kumar 331a4459f0 resolve merge conflicts of ac0fd76521 to master ...

Change-Id: I260f92df29e737736e4c0f531656417a202ee607
Test: I solemnly swear I tested this conflict resolution.

2017-10-23 22:36:09 -07:00

..

anomaly-tester

Import translations. DO NOT MERGE

2017-09-06 08:15:05 -07:00

robotests

resolve merge conflicts of ac0fd76521 to master

2017-10-23 22:36:09 -07:00

unit

Move ManageApplications to sub package and remove dead code

2017-10-12 13:48:54 -07:00

Android.mk

…