OSDN Git Service

Merge "Cherrypick e2bdf98b from master to r12. do not merge." into tools_r12
authorXavier Ducrohet <xav@android.com>
Fri, 10 Jun 2011 21:18:29 +0000 (14:18 -0700)
committerAndroid Code Review <code-review@android.com>
Fri, 10 Jun 2011 21:18:29 +0000 (14:18 -0700)
commit8c3a82f72fac206fc121ed8ddc7c429f542ea5f3
tree19b80cead9bb6715cf29ba3f1dc19153b7c26584
parentdfdde43ab8be8d33de7171b5ea8038763e3f1f26
parentee32cbac3721143350bf6eb43dd8cdc705ca314d
Merge "Cherrypick e2bdf98b from master to r12. do not merge." into tools_r12