summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-04-01 20:21:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-01 20:21:00 +0000
commit78014a78155ad05ca2e0af600c0545377c04bdbd (patch)
tree78be8f43b0f675b8fc913f1d8515c0eb177dc89d /core/java
parent7598a248bdbeb58a4b40ad773f39137b0dde1137 (diff)
parent04047af628338aa7859ae1f24700e1e4e3ae63e7 (diff)
downloadframeworks_base-78014a78155ad05ca2e0af600c0545377c04bdbd.zip
frameworks_base-78014a78155ad05ca2e0af600c0545377c04bdbd.tar.gz
frameworks_base-78014a78155ad05ca2e0af600c0545377c04bdbd.tar.bz2
am 04047af6: Merge "Use Keymaster-friendly validity dates."
* commit '04047af628338aa7859ae1f24700e1e4e3ae63e7': Use Keymaster-friendly validity dates.
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions