summaryrefslogtreecommitdiffstats
path: root/core/java/android/util/TrustedTime.java
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2014-04-18 15:08:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-18 15:08:56 +0000
commitb90e504ec17a7f509521c21f2b937a2ebefaf6ab (patch)
treea29c43453b3eaad2f66f47d6b0a489a5c28668bd /core/java/android/util/TrustedTime.java
parentfa711a33be265d1fcd08efd850085615ec66dd89 (diff)
parent649da9b505498ff87d75da56d376d46c22e50782 (diff)
downloadframeworks_base-b90e504ec17a7f509521c21f2b937a2ebefaf6ab.zip
frameworks_base-b90e504ec17a7f509521c21f2b937a2ebefaf6ab.tar.gz
frameworks_base-b90e504ec17a7f509521c21f2b937a2ebefaf6ab.tar.bz2
am 649da9b5: am 5a47a9f6: Merge "Native Runtime: Add LOG_ID_CRASH"
* commit '649da9b505498ff87d75da56d376d46c22e50782': Native Runtime: Add LOG_ID_CRASH
Diffstat (limited to 'core/java/android/util/TrustedTime.java')
0 files changed, 0 insertions, 0 deletions