| commit | f7a9c9e4059a66adf063ee680b84ac327f88a4e0 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Oct 12 07:33:30 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 07:33:30 2012 -0700 |
| tree | d5cb8453e9481adb5715645607d389052cf64851 | |
| parent | e92e9bf68c12c586ea0c6237df80a8ccae5b9468 [diff] | |
| parent | cedd601dfac9c51cc690a0fff79c2fb905f47ab6 [diff] |
am cedd601d: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'cedd601dfac9c51cc690a0fff79c2fb905f47ab6':