OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:47 +0000 (16:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 21 Aug 2012 23:07:47 +0000 (16:07 -0700)
commiteeca586bda0411d162307e1581e9308f5173592e
tree2141a3770ea8b626f5b66e331bf70c8911debda7
parent025aecc7180d09b73220c1218fcc002d00f2d6a2
parent88b58dc4f13e6cad92f4f77927e410029aefeed9
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic385ef16d6d685014334b320ddb7f1929c34bfd3