OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:34:44 +0000 (15:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 22 Aug 2012 22:34:44 +0000 (15:34 -0700)
commit3cfa40b4afbaebc80810b0efaa3763d8af0d040c
treee29035d93b429a009abe663c397e8919204e1cfd
parent729eebbb4e4ec5b826b7230b4c02267da341b70b
parent497b25e87a51b4afd206ba7734971614d00301fb
Reconcile with jb-mr1-release - do not merge

Change-Id: I3fe6509183beaa0dab8b3525d5bd70c7f5fd84c1