tree fce6b32db2d11320de4d53a59f249f32db7f1343
parent 27f2cfb72e932a3ccbb592ef9b75e37542ceabc4
parent b88ca53a465ef004a60ceb9c4c641c3c997edeb5
author Ying Wang <wangying@google.com> 1377285588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1377285588 -0700

am b88ca53a: am ddce2eb0: am de32713f: Merge "Collect and store proguard obfuscation dictionary files." into jb-mr2-dev

* commit 'b88ca53a465ef004a60ceb9c4c641c3c997edeb5':
  Collect and store proguard obfuscation dictionary files.