| commit | e761ab8fedb522ce9cc50e448fe2b5cd53b75f41 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 08 06:31:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 06:31:49 2012 -0800 |
| tree | f74fed9dc6982f5abc02c0dc550147b46ad860fa | |
| parent | 66eba009141ec2326a36ac5eafa0c94cf9632cab [diff] | |
| parent | 37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b [diff] |
am 37ca54d2: (-s ours) am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge * commit '37ca54d2a212cd4c1cb4ebf7d3a6cabb1748fe7b':