OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 16:56:05 +0000 (08:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 16:56:05 +0000 (08:56 -0800)
commitb7b605ff5b4682bc650461c2b987aa031a1071ca
treec99620fb0f3729c3c9166594c93af75e8494dce1
parent6b77115da5de1e6d82a1e96e30ffdb3f1a90a54d
parent496a743a14eed55feb734d715f68fb8d5d8a0e27
Reconcile with ics-mr0-release

Change-Id: I5f6ea1b12b77924424ff87495db2b2a262f8f3f4