OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)
commit6c2c5d8eec5e140ebedee7330988015df6aeb8bc
tree8f84e5420d2c383812e447c2ea952119baa519cd
parent96f696d90176b53c6902455b270960dd88ca1c1a
parenta9819e2ff1f2f007d84f166c52636d783106f304
Reconcile with ics-mr1-release

Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7