OSDN Git Service

Merge from ics-mr1
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:47:43 +0000 (07:47 -0800)
commit02f2cff12c26faca7e834af7b6003a766fc84f05
tree0784d17d80f88a0c09f9a2c4f6ecc4047af63cef
parent3a1fd1a624f263250da3142b8b956d5e9f90fab5
parent15041183629f04ddcecb0a369e05bc988b51c015
Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953