OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:18:55 +0000 (14:18 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Nov 2012 22:18:55 +0000 (14:18 -0800)
commit17e06817a22f2a13baddec627dbf385d8799a604
tree4ffa3d9c5bb05c59aa2324de213b7cc75600dbda
parentd84f02944f78595c3f72eb7e8bc422c63bd6ce89
parent81d04b7a6cd173c46f71cfbc788d3621a07d1e21
Reconcile with jb-mr1-release - do not merge

Change-Id: I1ff0e098597e9de600fbec6b6661206e66a72afc