| commit | 60d3552154d496c16b6eb850fd219d02e470fac2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Sep 28 00:32:27 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 28 00:32:27 2012 -0700 |
| tree | 9bd3c53ac506acc43a5f6a9355652e970aeb1cbb | |
| parent | 0bfd48131bf7d06c928fa8b165904630a1d976d6 [diff] | |
| parent | a553b7034accf5d4eadc42a5ab21dbb8b8ec9d6e [diff] |
am a553b703: (-s ours) Reconcile with jb-mr1-release - do not merge * commit 'a553b7034accf5d4eadc42a5ab21dbb8b8ec9d6e':
