| commit | 252b664149b0e30d668d318df295ee5b953d5d88 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:23:58 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:23:58 2012 -0800 |
| tree | cc80f8071c6a2d355219667753a0b0a73549cd3d | |
| parent | d6104752c59fa93e6fdedcb74cbae606a091c355 [diff] | |
| parent | efaa84d5a7d6c6572924e228a829775f7c484b2d [diff] |
am efaa84d5: (-s ours) am fd563856: am 7949399a: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'efaa84d5a7d6c6572924e228a829775f7c484b2d':