| commit | 60acb59089c1e73f74da900d98dc48924a2fabc4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Nov 09 07:24:10 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Nov 09 07:24:10 2012 -0800 |
| tree | 15639bd1c3a759468017f044da6e9e20bef8cc62 | |
| parent | 483041c9c4b2812d67de53e567ce059d5e3417bc [diff] | |
| parent | 7a396c3972de860a4a5874cd3ff1b6b88a610cc2 [diff] |
am 7a396c39: am 18f95189: Reconcile with jb-mr1-release - do not merge * commit '7a396c3972de860a4a5874cd3ff1b6b88a610cc2':