OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)
commitf4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad
tree6b5a591bed19239d97501c493a79632986f5bff6
parentb4d720f9d739f5618d6acef9bd87837700c908eb
parent3bf09a9f843a0ceabecbd5a2a338c36df268872a
parentd4c6b22188ca084759e7c8cc7906f5ea424a46a0
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934