OSDN Git Service

Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:14:04 +0000 (08:14 -0700)
commit5bf8c80f3ef08c9543460a56aa98264fc4dc9b61
tree006537295c0cbdd24be22fbf5402a17917706b76
parent8759c0f697de146d332a01cbc745cb70143c00e4
parent8f5c8b9be7b45acce6fbee800bd919ff4731139b
Reconcile with jb-mr2-zeroday-release - do not merge

Change-Id: I5a0af2cc544c873654fb328b96b0bf1eed32d4ef