| commit | acdbbdcecb6e09b8fc4372cf4b9db69823aec31e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon Dec 10 15:23:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Dec 10 15:23:22 2012 -0800 |
| tree | 07a99dcb8fb1c21b0995f991f479859f25f39bd8 | |
| parent | 92573f1ba0d5360d7bfa8ab8935118db7a251f62 [diff] | |
| parent | 064d252918c23cc4c90f8bc62f9ae47ba7afa4d5 [diff] |
am 064d2529: (-s ours) Reconcile with jb-mr1.1-release - do not merge * commit '064d252918c23cc4c90f8bc62f9ae47ba7afa4d5':