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