Merge "Hardware keymaster HAL should not indicate 'software'"
authorKenny Root <kroot@google.com>
Fri, 15 Feb 2013 17:35:29 +0000 (17:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Feb 2013 17:35:29 +0000 (17:35 +0000)
1  2 
libkeymaster/keymaster_mobicore.cpp

Simple merge