OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)
commit50845c903200fbf5e1e61012376516931e945e4c
tree85df096ae36e2226ef9344e1ac419d8ebee8c1b2
parentd17ce3f8c06b9dec0f20075043a7806cc0224e1b
parente4fe3a4f41f296ac0471152542fcfd904ee50b0e
Reconcile with ics-mr1-release

Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8