| commit | ccd1c21f4491422cedd9ac122d964aa50c5c8fcf | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 31 09:23:13 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 31 09:23:13 2012 -0700 |
| tree | f5f158caa46550c9144606d3c5d90bd7b6868528 | |
| parent | 0155b7e2ffd69d647c480a21af00904bea7b9ba5 [diff] | |
| parent | 3522330d404640c59a3843f88ed56bc95d86750c [diff] |
am 3522330d: (-s ours) Reconcile with jb-mr1-release - do not merge * commit '3522330d404640c59a3843f88ed56bc95d86750c':