| commit | 7d79e5016f65b1067b4146c0c4e3ff2e6e95cf13 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Nov 06 12:40:15 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 06 12:40:15 2012 -0800 |
| tree | e6e4939d89a60fb561f0c8bbaed0eeb662d17cef | |
| parent | b3758ba79191a40ece0e563008f96145286fc167 [diff] | |
| parent | 66d3e192ea68d266a00307b23b40a44eff8d01af [diff] |
am 66d3e192: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '66d3e192ea68d266a00307b23b40a44eff8d01af':