OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:15:16 +0000 (09:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:15:16 +0000 (09:15 -0700)
commit089111a80a6a167de827bf32ae2d2a935ff5874f
treecd989147d5b36fbda8ca413c698f1270eb429eb4
parent3cd7a1653aa579213cb68a666bd9949e2b8fff95
parentf29c214d6ad97f9a5348407cc66a58aec2228ca9
Reconcile with jb-mr1-release - do not merge

Change-Id: Ice07f7813d823b0419153d5ac321ad784a690af4