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