OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)
commit7000342da9241170fa831a8ec887ecc6f4aa426d
treeab3f350d9026b49435f7f78f25dd877bf95c8f04
parent4243532d4a0ec368d6722265af94ebd962877623
parent54578dd1aad3dce8c999e15d6ec7cee87fbef6f8
Reconcile with ics-mr1-release

Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8