OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Apr 2012 21:40:27 +0000 (14:40 -0700)
Change-Id: If202c8b713a5d273115764c404cbe45a88c8d658


Trivial merge