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:18:37 +0000 (09:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:37 +0000 (09:18 -0700)
commitd8515a1d78636f2479587cdcc944a65b75ab4e63
tree2f374c3787b1cd4c80a74ee84b51dc1082622a4f
parentebcfb8e8d8da14bdcd79f42e53e392b84b82a78f
parent62abddace39aaefecaac10779a6ce2a213b7156c
parent859ce033ec1119274327515b8aaf915cd2615c50
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I40ce39e6f067e352b19562897b2baf2bab3b6a39