OSDN Git Service

am d5c3cb5f: am 890e41c1: Merge f870f2d - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Nov 2012 15:35:32 +0000 (07:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 Nov 2012 15:35:32 +0000 (07:35 -0800)
* commit 'd5c3cb5f23429cf4e1c7b08c5e926174a64b4703':
  Add dx option to always generate const-string/jumbo.do not merge.


Trivial merge