OSDN Git Service

Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 22:10:50 +0000 (14:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 21 Dec 2012 22:10:50 +0000 (14:10 -0800)
commitf6315729088bb1ebbf5d8ab6e810dd3462973018
tree886e43ddd1e8d50cf1476a252fc31458b8aaf7f8
parent9b2ef2237229ca1ce38df2d54550985ec5f7fdaf
parent5a6a0faa2aafdf94fc60161f065a0029e5560346
Reconcile with jb-mr1.1-release - do not merge

Change-Id: Iff920fa574533c1c22a8c1408291f43e81ab7a2f