OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Dec 2012 22:03:11 +0000 (14:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 Dec 2012 22:03:11 +0000 (14:03 -0800)
commitd1b25b86ad8eca832ccb1af43e3992d9441b8bfc
treed006dd996a43be76a038d774bb920aabf0795f0d
parent0adc185a8cf117c5c7edda7cf5a8257343948342
parent20bfc920bf1657de2d9e45234702044512f1c92a
Reconcile with jb-mr1.1-release - do not merge

Change-Id: I9499ee080c842e363f7aa78057f714dd3e32d43d