OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 21:58:59 +0000 (14:58 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 21:58:59 +0000 (14:58 -0700)
commit4cdeb5ec9610b0bb5308d72eff11ab4b07791ce9
treeb36d59aeaf3356a1bfae69e8466b14e3a116eb1d
parent85ccf48d95958b4ca18fc0136fa57683d8434cb0
parent65653cf3a59c53119616ef6578391ea1fcfffab7
merge from open-source master

Change-Id: Ib789754dd5fa04ea4232220c8a06bda9051b75c3