OSDN Git Service

resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp
authordcashman <dcashman@google.com>
Wed, 13 May 2015 20:20:05 +0000 (13:20 -0700)
committerdcashman <dcashman@google.com>
Wed, 13 May 2015 20:20:05 +0000 (13:20 -0700)
commit5fd0b6d43bb223bc488d903efcd1b5537be09b76
treee7fa91b692f3effc0b1a9a4b64de63fab6be4787
parent06b07daa70cfd10a8154769c895b05fe22a1e582
parenteab5ab5df5e4ff47865d7024718a3c18b669b75e
resolved conflicts for merge of eab5ab5d to mnc-dev-plus-aosp

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