OSDN Git Service

Merge "Merge d4166974 from master. do not merge. Fix issue with resource repository...
authorXavier Ducrohet <xav@android.com>
Fri, 20 May 2011 23:10:59 +0000 (16:10 -0700)
committerAndroid Code Review <code-review@android.com>
Fri, 20 May 2011 23:10:59 +0000 (16:10 -0700)

Trivial merge