| commit | 70d97ae3d0e0c707fadbc41067c8ad8fa39a0f9c | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 12 14:16:36 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 12 14:16:36 2013 +0000 |
| tree | 4c4b804ed1da503917d91024def5a27df6e14fcf | |
| parent | 3284773891d03dc3b9d5ad79ef9e5e1c98096621 [diff] | |
| parent | 7c8af2252a5814a34f30922ac7d5d63bd891e525 [diff] |
am 7c8af225: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '7c8af2252a5814a34f30922ac7d5d63bd891e525':