OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 11 Aug 2011 22:27:57 +0000 (15:27 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 11 Aug 2011 22:27:57 +0000 (15:27 -0700)
commit3cd5e8bd90ae95791de2ba48f2ba2c4122b9d377
treeb660f852f7be6c34c9bf72114d9bbbe4938a0f26
parent42409a3bd3b446e071e0da482692f3a87c58ae22
parent1911bf0a7bfac42cb80dbe9c329f14559b4c4127
merge from open-source master

Change-Id: I7f1883c05fc90f755f6d8eb486d3da1309f49fa0