OSDN Git Service

Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:15:35 +0000 (09:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:15:35 +0000 (09:15 -0700)
commit73032be2fe9305281bd8a68a3030bef922f1f972
tree1509bf35d03ed13c71e4ed98bae5aa067b5d5864
parentade14ce41d3e22802c77c18c35ca3e41867f1049
parent7284c78e14a7aad15b4f1c66c0a18d09a49c00de
parentc087108ca634ab9587044bebd1e69746021ce2e8
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: Idcb8619166f794d334655aaf35232bb6a09e1c9e