tree 43399c6b9f6d920d11e006f19b53529c1631290b
parent 9735865121118f255c4c15183b236f9f30e795f1
parent 69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5
author jeffhao <jeffhao@google.com> 1350497313 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350497313 -0700

am 69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not merge.

* commit '69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
  Add dx option to always generate const-string/jumbo. do not merge.