OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Nov 2012 22:21:29 +0000 (14:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Nov 2012 22:21:29 +0000 (14:21 -0800)
commit3f88803dc0d2aebf408dd12860ef101ef79df534
tree3a5f097a20836ab85a99a015604ce2d66773866e
parent7f0caa642a83020dd2d48f8c50d14f0d3a330fe7
parentfad94797ec01073047da7d4a2aff23dbfce0ac4e
Reconcile with jb-mr1-release - do not merge

Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4