Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:05 +0000 (09:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 2 Oct 2012 16:19:05 +0000 (09:19 -0700)
commitdbea1726ec364636312340de940c5f80c34ec1d8
tree8a9ee021b4fcb16d17242836e03f006be7e7ef09
parent7c01bc1c04e4e7af151aea542331e7556dd6f585
parentbc5ac35e1ac6a4415ca204febb1566d34164658a
Reconcile with jb-mr1-release - do not merge

Change-Id: I0d505138d8787065c448c5d3d5523a21329c6e90