OSDN Git Service

Reconcile with jb-mr0-release jb-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:55:59 +0000 (18:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 Aug 2012 01:55:59 +0000 (18:55 -0700)
commitdfab95a150da3014794fc92006c7f44e635ce1f6
treeb9eeab405c4741bf4eda54e99707960b96581111
parentd77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e
parent0e29ca910bcb20946a1250dd2c42a43ee82385b2
parent52ea91675578379e6ce16938f19cb6dcca282e06
Reconcile with jb-mr0-release jb-release - do not merge

Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05