summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAlex Klyubin <klyubin@google.com>2015-06-19 22:53:20 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-06-19 22:53:21 +0000
commit84a378f256bf7925ceb5d2c039a033d3e59b75df (patch)
tree132c8e27015cbce33888005a5a81bf3cea702dc7 /include
parent1e575a0f32a00fc6a2f9a71fe1d1eb4426c71787 (diff)
parentae1e0e9265ce276d33ed47349074f443ea028b93 (diff)
downloadframeworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.zip
frameworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.tar.gz
frameworks_base-84a378f256bf7925ceb5d2c039a033d3e59b75df.tar.bz2
Merge "Fix a bug in Android Keystore updateAAD." into mnc-dev
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions