OSDN Git Service

merge from tools_r10
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 01:01:03 +0000 (17:01 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Feb 2011 01:01:03 +0000 (17:01 -0800)
commitbf55bd2d23beb6e49b932599dd9723e17e2e25dd
tree0e8f1a142dde24b29cfca1a4f89e7c101105667b
parent4fb02a715fcb0b1eeb176c21d2f49d878d0f80f7
parent64caec4598bfb49bca9576f78316877f21963884
merge from tools_r10

Change-Id: I8852a3ca28977057efff4aa50f31f99d5bf5b67c