tree 688386c7b0eb5a35afb523c46f1d2761471c41e0
parent 3d8c678136ed34e2573a46123681e6a647e5537d
parent dddd6f73a96a10a07edf486155e3b078380f9146
author Alex Klyubin <klyubin@google.com> 1431449770 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1431449775 +0000

Merge "Hide @IntDef and @StringDef annotations from AnroidKeyStore API." into mnc-dev