tree 26b669704c987a2744a13dd32bbe6569f10a3b57
parent 7708feea65977c33b86688d5d93fec56a2f9dcd9
parent 5b458e8602cdc6bd9bb0663aa48428eaaf77383d
author Trevor Johns <trevorjohns@google.com> 1374638191 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1374638191 +0000

Merge "Move gradle warpper for BasicAndroidKeyStore" into jb-mr2-dev