OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb


Trivial merge