| commit | 5178a538864db1000540950ea71dd545bf4824ad | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:23:18 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:23:18 2012 -0800 |
| tree | 4d7982d19eb95ed9b63d7381302292210a43eba4 | |
| parent | e2d2877aa44010e06f5317df015f07fa389b5378 [diff] | |
| parent | a41474d45c455c98bae9986b626374cb626886ce [diff] |
am a41474d4: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'a41474d45c455c98bae9986b626374cb626886ce':