OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Nov 2010 21:46:29 +0000 (13:46 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 8 Nov 2010 21:46:29 +0000 (13:46 -0800)
commit193997186b8429499cca076b19dafb79742687f9
tree028474e7fac470f1ec31076196a26cd3775f2466
parent15af2999bfd376e38921fe8553f148888953eb38
parent0b51399d2ae99b94608c6cbb3533a3101142c24c
merge from open-source master

Change-Id: Ie8820121c32589443f5d53099de2f04f4753d9f7