OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Dec 2011 15:53:10 +0000 (07:53 -0800)
commit8002c53144bf80cb7652b7a6ae7271cec86f7409
tree0cbdff8cae2e1ca7580a79088eff58ae4cb11dac
parenta63ee4c2fdc4869fd1169d22e79ae9f1220c5bdb
parent364c35983313c20a28c0377f5353688d82a81dec
Reconcile with ics-mr1-release

Change-Id: I1c603308272f9b00174c3f9046171e069ffee566