OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Oct 2012 15:18:42 +0000 (08:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Oct 2012 15:18:42 +0000 (08:18 -0700)
commit3d646745f76f1f39c295d0da9d17419c237ae186
tree077354a2b285cb0ffad255d3f08a2ff69c013594
parenta1e1799a082283f960dafa376ae83880b3b5bf2e
parent76a5077f78c062c53bbfa83e6d6e94c1e0e88489
Reconcile with jb-mr1-release - do not merge

Change-Id: I6ad917dd332cd6677d124b08197e1686e66e0fca