summaryrefslogtreecommitdiffstats
path: root/libs/common_time/main.cpp
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-08-15 17:38:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-15 17:38:50 +0000
commit897a2cfcfc44d9644a8747574b9ba6925e048bfe (patch)
tree3aa5b2872d27ae2d6baa7209ee67c572ef60c38c /libs/common_time/main.cpp
parent32db2c97e47e14468cb5660b7f30b1feeaa4ed24 (diff)
parent21d1b115a1d79a00991dddb883d9fb3e1863e35c (diff)
downloadframeworks_base-897a2cfcfc44d9644a8747574b9ba6925e048bfe.zip
frameworks_base-897a2cfcfc44d9644a8747574b9ba6925e048bfe.tar.gz
frameworks_base-897a2cfcfc44d9644a8747574b9ba6925e048bfe.tar.bz2
am 21d1b115: Merge "Disable verification based on vold.decrypt. [frameworks/base]"
* commit '21d1b115a1d79a00991dddb883d9fb3e1863e35c': Disable verification based on vold.decrypt. [frameworks/base]
Diffstat (limited to 'libs/common_time/main.cpp')
0 files changed, 0 insertions, 0 deletions