OSDN Git Service

Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:13:29 +0000 (08:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 10 Jun 2013 15:13:29 +0000 (08:13 -0700)
commit6c1d6385622798247881e8750864d17f49038e4c
tree18edaa92da53733b027bb753a10cdaa472e98e07
parentf2d5533e87b18069b77abea531dfdee627306887
parentdd4fad0ce960482f9d24e4453e726bf3d8580430
parentb2b3db347f9086fa4517262463edd4323cb57f12
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge

Change-Id: I80cacfe6593b8595da9df2827790fc763c1a25ee