OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)
commit12d3448d5eea717de510f52112281d22293fd47e
tree485b152b97bf8321fdd223f35587bb4294672be8
parente25359b5bb4163d350bea939e830fb59b071249f
parentcbe3d5bc7e029cb2dcc28622efbd5fd6bc9d7066
Reconcile with ics-mr1-release

Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7