OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:06:01 +0000 (10:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 10 Apr 2013 17:06:01 +0000 (10:06 -0700)
commit122bfe4f0495c22f1c18e4d79d7d20c2f3795114
treeb838245c41f1a542bb016ad966be58acde5396fc
parent0c8f9246437234a0de217feb339c5811012bea5c
parent071d2cf06fbe02805d22de383cb9750659825c7e
Reconcile with jb-mr2-release - do not merge

Change-Id: I5597c4b46c146b190370d63e0128d2d84f80888a