OSDN Git Service

am 426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 26 Jun 2013 19:37:49 +0000 (12:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 26 Jun 2013 19:37:49 +0000 (12:37 -0700)
commit2ff37b246ae1242d015ff40433a444bcee9ff586
treede708257e6d7cab67d0f9444ab9c1e8428919f95
parenta4ba587282779ab3081966fb65f1e59a819fe85c
parent426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7
am 426bf5ad: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

* commit '426bf5adf0f6f3f5579ae2b97c2caaee7dae1fe7':
  "JSR87"