| commit | 98a937f87e5b0a12f40b7a79751d8a45d094e300 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:31:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:31:15 2012 -0800 |
| tree | f5f158caa46550c9144606d3c5d90bd7b6868528 | |
| parent | ccd1c21f4491422cedd9ac122d964aa50c5c8fcf [diff] | |
| parent | d9b11c3a7bdffa02bf7e2bd84f291c9c7418c884 [diff] |
am d9b11c3a: (-s ours) am cc86adcb: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit 'd9b11c3a7bdffa02bf7e2bd84f291c9c7418c884':