| commit | 68d7f8a28d173df038967f8b4d75110cfa1313f2 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 20 16:42:00 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 20 16:42:00 2013 +0000 |
| tree | 6fd0a882951c48ec8d21b63db5b5442b11748376 | |
| parent | d24896cf3f4e91dd7bfa0abbd0677ec6edae0529 [diff] | |
| parent | 36b4980ac6cbcabf25364122e67cb157b80298ff [diff] |
am 36b4980a: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '36b4980ac6cbcabf25364122e67cb157b80298ff':