OSDN Git Service

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


Trivial merge