| commit | db7894b3cc23c55857a6837ffe850628b39734b8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:48:01 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:48:01 2012 -0700 |
| tree | c6f827a58b7a3662745289557272eb6f55ae7039 | |
| parent | 04c9f7fbbf64c4fa855ff4fbc4325c2aa0e74f83 [diff] | |
| parent | 15480409f3b085b3292af0ec894d2bed2bc147a2 [diff] |
am 15480409: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '15480409f3b085b3292af0ec894d2bed2bc147a2':