OSDN Git Service

Reconcile with jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:39 +0000 (07:52 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Nov 2012 14:52:39 +0000 (07:52 -0700)
commitbfb645050356fa854da6adbd9091454ad4376c21
treeb42898609dd5e8a3dd2966dd550ca4f406c26f82
parent98dc7952f3a6ba4658c70d4ec7574feff34bf73f
parenteed7a477584608acae2d2ae8400322a41e5ccc56
Reconcile with jb-mr1-release - do not merge

Change-Id: Ic84ef2f21e05ef7e9606e0f9defc7865d248c59d