OSDN Git Service

resolved conflicts for merge of b9e4848e to master
authordcashman <dcashman@google.com>
Wed, 22 Apr 2015 21:49:23 +0000 (14:49 -0700)
committerdcashman <dcashman@google.com>
Wed, 22 Apr 2015 21:49:23 +0000 (14:49 -0700)
commit9d50b548cdbd1e98f9b68ca256d63f03ae9dd3ce
tree254e3db8cfd8f6f4dc5329e38da2ea1620e5e28a
parent75050017066d00adb03ce2f7c98695f3cda8376e
parentb9e4848ef5985f28013d0491281f6b1db9a0713f
resolved conflicts for merge of b9e4848e to master

Change-Id: Ia1ea1c3cf7669c2eeaefa1f10c511aa1e782386b
core/tasks/cts.mk