| commit | ec72699b0eaf7917b437a0b5c97c529ca3dfb6b2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Aug 08 08:17:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Aug 08 08:17:13 2012 -0700 |
| tree | 8efc539d1247e764b9864a7519c21c251190b9af | |
| parent | b111239deb57873905d8e0556d05b2ab26839884 [diff] | |
| parent | 094c637b0450729fa2b20a4f63768f83daa0ac0e [diff] |
am 094c637b: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '094c637b0450729fa2b20a4f63768f83daa0ac0e': JOO39 JOO38B