| commit | baa97012143a8601aff04428a179446d8182a4a4 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Aug 10 12:36:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 10 12:36:39 2012 -0700 |
| tree | e989c110242df97a003d67e34eb1890da23085d6 | |
| parent | c2872a62402c7e075a1f9cfba04c4e4d65c30c8f [diff] | |
| parent | d4c6a2edde97a7709086e9a3b7ecb028cecd9bfb [diff] |
am d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge * commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb': JZO40