| commit | 1d9b1834689d694802dea4f9a10f00a8b7c21d12 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 08 15:52:25 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 08 15:52:25 2013 -0700 |
| tree | 0cc8454584b5123983fd8d7512d6d2f33dd0cb76 | |
| parent | ea83a4b7afa1e78ebcd4bf418967888260f5461a [diff] | |
| parent | cb7f5b94a3d683f297ddf839ca4aa897e0927139 [diff] |
am cb7f5b94: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit 'cb7f5b94a3d683f297ddf839ca4aa897e0927139':