OSDN Git Service

am d5cc3680: (-s ours) am 9db54b1e: Add dx option to always generate const-string...
authorjeffhao <jeffhao@google.com>
Wed, 17 Oct 2012 17:53:43 +0000 (10:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 17:53:43 +0000 (10:53 -0700)
* commit 'd5cc36801bb86ba4e8b3db6efc67282f41b5b784':
  Add dx option to always generate const-string/jumbo. do not merge.


Trivial merge