OSDN Git Service

merge from tools_r8
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 23:45:46 +0000 (16:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 23:45:46 +0000 (16:45 -0700)
commit7b8e64de9afc64602d2c7dee1a721fd7c04f546d
tree7f62c5d9d9a27b7b8a897b72099f7adc44f1fa79
parent2067929e3e3297b0fd93baec2c3794461e7bcc54
parent40a26da69f5973d2570f4e9067131fd4c01b1bfe
merge from tools_r8

Change-Id: I8792be345899be48cbe7c22f386f09fd4aa13691