OSDN Git Service

am 69dd411c: (-s ours) Add dx option to always generate const-string/jumbo. do not...
authorjeffhao <jeffhao@google.com>
Wed, 17 Oct 2012 18:08:33 +0000 (11:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 18:08:33 +0000 (11:08 -0700)
* commit '69dd411c7ef47e3ea3f6ff8be9a4d903f545f0d5':
  Add dx option to always generate const-string/jumbo. do not merge.


Trivial merge