OSDN Git Service

am 53ab5174: Merge "Define trust agent framework components"
authorAdrian Roos <roosa@google.com>
Mon, 31 Mar 2014 19:25:58 +0000 (19:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 31 Mar 2014 19:25:58 +0000 (19:25 +0000)
* commit '53ab5174d5009786dc58da3011181b77e325c130':
  Define trust agent framework components

1  2 
Android.mk

diff --cc Android.mk
Simple merge