OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:09:59 +0000 (10:09 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:09:59 +0000 (10:09 -0800)
commit4b067bdf05bd8fca840253a43fb0ff25846d35c1
tree3baad09149b3873134aae029ee2942b3092e2d57
parentc902470310404e42aeb93fca38694b374371e0de
parent1426e71355828a1f714cc68280965dcec40ecaf4
Reconcile with ics-mr1-release

Change-Id: I148d68967a5aef6aef6c785222a35ff242406525