summaryrefslogtreecommitdiff
path: root/trusty/coverage/coverage_test.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-10 09:46:03 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2012-10-10 09:46:03 -0700
commit1595c5a8b8b6dc2dddcc79c2fa8239914125b124 (patch)
tree597eb98faaa99ad13b668f16c3ce8786b094ca49 /trusty/coverage/coverage_test.cpp
parent90b530070ad49d49844fe82ab674b5f1093b80a6 (diff)
parent7f9349da1f882fa8caf0ae4a0db1d6623affdf6e (diff)
parent035649eb10a0d38c12389229448df00f418a96b8 (diff)
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I3f20206be34b065992e47210bf5a10b3c4bfcfb9