OSDN Git Service

resolved conflicts for merge of 883ef249 to klp-dev-plus-aosp
authorChristopher Ferris <cferris@google.com>
Wed, 11 Sep 2013 02:49:04 +0000 (19:49 -0700)
committerChristopher Ferris <cferris@google.com>
Wed, 11 Sep 2013 02:49:04 +0000 (19:49 -0700)
commit2e7a8b44c2691770e917efcca80bc2650d93efaa
tree8337c18451366451d39aee09b6c9509e4a34437f
parent5cb04369309856f2d2960fe3fbd517ce4e403605
parent883ef2499c2ff76605f73b1240f719ca6282e554
resolved conflicts for merge of 883ef249 to klp-dev-plus-aosp

Change-Id: I1e2bd03a0cb5a0ab191c525d1574377bc7fd90ab
tests/fortify_test.cpp