OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:20 +0000 (08:20 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 20 May 2013 15:20:20 +0000 (08:20 -0700)
commit2eed10ac3f0386d814a7f92e51ee4850fdc7e8d0
tree13994688c20972d6faf83522e22ae2f6cf0528bd
parentc3de50cd3cff76082bc01b04a8a6bbde300d725e
parent1f3fa2cfeb92fd298638212fc27cfcd5f8093619
Reconcile with jb-mr2-release - do not merge

Change-Id: I3e9b5a584dcafbc3e42d0608d9c279cde7816702