| commit | 9950edcdcf6eea0495ba71fa35555bbbbd26954e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Dec 05 13:00:59 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 05 13:00:59 2012 -0800 |
| tree | 984fa0e156d4f644d5192469e605831e56ba3869 | |
| parent | c1493e1a01c45b491071142eefb485c90f08d823 [diff] | |
| parent | 08500d5741ae5b21a397957cfb441787f0224d77 [diff] |
am 08500d57: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '08500d5741ae5b21a397957cfb441787f0224d77':