Elliott Hughes a3524a255f resolve merge conflicts of 796987482 to stage-aosp-master am: bb5ec4a926 ... am: 314ddcd9a3 Change-Id: I4fee960013f5539d85613eb09e365ee580ed1745		2017-10-17 21:57:49 +00:00
..
Android.bp	Merge "Move trusty reference implementations to /vendor" into oc-mr1-dev	2017-08-23 02:42:18 +00:00
main.cpp	<stdbool.h> not necessary in C++.	2017-10-17 16:21:33 +00:00