OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:25 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:25 +0000 (08:49 -0800)
commit75c781c972b7d0359966a987e3f89a8bc7f06526
tree3baad09149b3873134aae029ee2942b3092e2d57
parent7f24ddbc75b301cd3520e8fefaeb2e94a6dcc80b
parent9ffda11f199c88c55c46f3258670fe19a9575cdb
Reconcile with ics-mr1-release

Change-Id: I1d101ce7d4690a74f494cdc605e797130946210c