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)
commit2a82a3a8824904f4e6750eb18dcc33ed113edbeb
tree9923d2dba8b8bf93adb3e4a54aa8788031f6c75b
parent736d8141e8f060c79c297c5447cdbe2c7fa9e231
parenta9d421d3c05b98ee5481428ca3dcb3e3245140ff
Merge from ics-mr1

Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953