Merge "Disable Test in CtsActivityManagerDeviceTestCases" into pie-cts-dev
am: f048a5cc1f

Change-Id: I893a631536603012ce5603e939c60e15fa7266cf
tree: 2a5ec19b6c63c4af5c1e6405aa17623d97e9f605
  1. common/
  2. tools/
  3. Android.mk
  4. test_defs.sh