tree 9bd42909ffe4bcf1b6785b91d608cc153c87347e
parent 972dfbc8b43aef5e64d7340f0244f3c601284eba
parent b50d0cd53f94b0c654e007464ec32396b0cb1aef
author Arve Hjønnevåg <arve@android.com> 1413842660 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1413842660 +0000

am b50d0cd5: Merge "rootdir: Make trusty version readable by dumpstate" into lmp-mr1-dev

* commit 'b50d0cd53f94b0c654e007464ec32396b0cb1aef':
  rootdir: Make trusty version readable by dumpstate