OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 25 Aug 2011 01:21:32 +0000 (18:21 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 25 Aug 2011 01:21:32 +0000 (18:21 -0700)
commit9fd54dcd920c2c1e210de26cc1678e9f6bee6407
treea20714b4c0a84b45f784a368d7a7b36d45f294a9
parentb3ef8796de8a3ccc60335d604fca5c0cf04a2c64
parentefb8b09255d8c4f4ea66f36e627a62d1f61445a6
merge from open-source master

Change-Id: I1d028cceb58c0a6604961afd4c6912ab63255e7c