OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Nov 2010 18:08:35 +0000 (10:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 16 Nov 2010 18:08:35 +0000 (10:08 -0800)
commitdbcedf1721f8c3bd740b319b76b1a2cec3059314
treed1ec4f145b10bc706ed2f5e39bf4239fefd6de03
parent8861ea6b05d7e1d4ab09229771f5e1d1e768f697
parentbb58ac496cc57087936b34a1ec3605582249f6ff
merge from open-source master

Change-Id: I920548d1aa7485e6a154255ad0ee9bc7e62c93ad