tree 801b58b8b3f461d8b13d2472fa0b119ce28ce225
parent ff643a71289d972e66a61637947090c6dc950d14
parent 43ee5e97c443949aa68c529e249ed6e1e5057de5
author Xavier Ducrohet <xav@google.com> 1386192518 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1386192519 +0000

Merge "Deactivate multi-thread in multi-dex mode" into klp-dev