OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:02:36 +0000 (11:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Aug 2012 18:02:36 +0000 (11:02 -0700)
commit84d8513a5c45fbafce3a2da3a51a438420cea85d
treef5e250c8294a948f3bf40c231125fe199e4c5e08
parentcbe053ce2a930384d8c2dc8dc7b150922d986026
parent113e8569691aa9fab1e19e08d5294ccfdd9f795b
Reconcile with jb-mr1-release - do not merge

Change-Id: I53a9779340308558b371b239dfe4048b9c8bb6fc