OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:21:02 +0000 (14:21 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Jul 2013 21:21:02 +0000 (14:21 -0700)
commit58311f908300bff0174f84d06116225c5d985107
treea44105b8863efaef6542e527620466760954d9a6
parentea6b5d63d9100f014cdedf438f1750ed65b822b2
parentcc0c5851a2119860f9ad6a7d0afbdadc23e9dea5
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I54f669254cc0552c2f0492d799f977854eed409b