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:14 +0000 (09:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Oct 2012 16:18:14 +0000 (09:18 -0700)
commit6e95bf2d18e26f2c1c819c7dc17beaf054f31ee8
treedee055c43bfd02714c2be2617ac031dc60ae63d7
parentff7ce625c651880245d0ca55e7755182fb014270
parente56b51b0605d693cc69e57df79859f2b5bc18eae
parent754f6583ce59a952469b353a1bf21f056d344b6f
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I892c2f6e71ca05d489dc6ead9faf0e70fa023f13