| commit | 6487fc18896582cb1f0f961b5034134e7dd3d6cb | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 01 07:53:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 01 07:53:06 2012 -0700 |
| tree | a16fd2fec5cbba8393c3c19c6f056a03909a4b03 | |
| parent | f4bbd8c1e99adc1bcbbac635ac7ed1a33efd4335 [diff] | |
| parent | 9f1ba7e687e115414f6ef6979b5b355f7b7e21a5 [diff] |
am 9f1ba7e6: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '9f1ba7e687e115414f6ef6979b5b355f7b7e21a5': JOP31