| commit | 8f3bc0c94473d90d0a68e251e96551d56e7039f8 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:10 2012 -0800 |
| tree | 442d793ef58f5cd77b1c0d1db8a0b6804723ab0f | |
| parent | 2bd3f3dca1f2dac0d3d2788c6fa54e2eeb477e40 [diff] | |
| parent | c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e [diff] |
am c2e5b273: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'c2e5b273c43e3d1649c5f8cecb47c7d84afb6f6e':