OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 00:52:46 +0000 (17:52 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 00:52:46 +0000 (17:52 -0700)
commitd5c35dfc46e58abfe99a3bbbd92dd6538ffa5d42
tree78ec706d9f72a8c8f700e6e31d642a81bcd6625c
parentf02718db30f5550847fccc3b1711193bfc09ff2c
parent865aa007943e48deec178a387dd2eefa912b1201
merge from open-source master

Change-Id: I05af4707413ca01e4a26750f25371e11ffa35da5