| commit | d3ef89148cde944aa1b02a2e8410168a9695e208 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 13:29:16 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 13:29:16 2012 -0800 |
| tree | 9015cdf92a7ed8a1276e53c7735de041a5e8e1d6 | |
| parent | 5535a9e9806775dd09279e9fe415565ced30f3ae [diff] | |
| parent | a11e2d207e2e5d3a6d4cdd7c7a90f3c16348608d [diff] |
am a11e2d20: Reconcile with jb-mr1-release - do not merge * commit 'a11e2d207e2e5d3a6d4cdd7c7a90f3c16348608d':