| commit | 077f6a7bf803100cde1c195893a87085aa5bc8b5 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 26 13:59:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 26 13:59:20 2013 -0700 |
| tree | fa8be17b6413a5b2bd4002d21b78297a4349a39d | |
| parent | 5129f468eafdcc10eed081968a73791b281704a6 [diff] | |
| parent | cccad1ee2a8bd83127414e169d16d14d542fff75 [diff] |
am cccad1ee: (-s ours) am c5fdc939: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'cccad1ee2a8bd83127414e169d16d14d542fff75':