| commit | 4ca0c72f2b707f31de29acc4d3262e1a86bbd39f | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jul 15 09:37:54 2013 -0700 |
| tree | ebe8589402f6217275ec638fbcd46a31c9c5a20a | |
| parent | 883140d0bff7ea516c27ade0215c4671b6512f88 [diff] | |
| parent | 65752b2b516204d890e59dbc395608d7dec0cff5 [diff] |
am 65752b2b: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge * commit '65752b2b516204d890e59dbc395608d7dec0cff5':