| commit | 52eb4bec9cb07085820789a8317f8b1bbba34319 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 26 12:17:49 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 26 12:17:49 2013 -0700 |
| tree | d9baae11a5d557bed343be8e973db99eb44f0f23 | |
| parent | c824edaea2484cdf421ebf388d9dcdc4aa3fc7a2 [diff] | |
| parent | 52c67a8c82f5878d734f778a20c21f6d0f53a222 [diff] |
am 52c67a8c: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '52c67a8c82f5878d734f778a20c21f6d0f53a222':