| commit | 80d8ef2d64363a6fee30f4bb86a31c5f21f3667a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Sep 24 10:18:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Sep 24 10:18:45 2012 -0700 |
| tree | 5582a64ccb986c793c3da1e76833678f13a0a406 | |
| parent | fa24e81cc6619d0ba8edcdb3b4ada5f6d293befb [diff] | |
| parent | 16a3b838f203d25d092673bba9d1682e70735289 [diff] |
am 16a3b838: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '16a3b838f203d25d092673bba9d1682e70735289':