| commit | e5339f49b704e0682edb90f3c2c5f4c4eb38873b | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Thu Nov 29 14:10:07 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 29 14:10:07 2012 -0800 |
| tree | 73fa0101f83e6cd031de5e9317649d7d0f32d99c | |
| parent | c19c2e8d4fecac66eeb9f336d566391ce2fa5e23 [diff] | |
| parent | f7e3bf10d1cd8f6fb9c27554cee49236e2a60604 [diff] |
am f7e3bf10: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit 'f7e3bf10d1cd8f6fb9c27554cee49236e2a60604':
