OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:25 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:25 +0000 (10:21 -0800)
commit374011a72ef62b2381235f07fb9117fbb03f12c7
tree0478a79b38309256c4d16d9664c89d1aedb1117d
parentd7b15982d21bad7a34bba3c6aa1d6448cda117dc
parent69dbcc9ad79a3d869d798d4adf179f36ab8f370b
parent91158c9b5ea304472fff2c617cdbffaabef9585f
Reconcile with ics-mr0-release ics-mr1-release

Change-Id: I7bc70364e017d1c67bcc4b308e0aff5eaa19e661