| commit | 33aa662ddbe474beaa47dca4ecd02a1d3873514a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Apr 03 18:05:29 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 03 18:05:29 2013 -0700 |
| tree | 85f2369be584c47eb3277a117750fa4a3c5dd04a | |
| parent | 0191be1d6795340cc20dc0388d80b4df1302a773 [diff] | |
| parent | f1bfab47b89c8fab7811339c02848ee5a10ec335 [diff] |
am f1bfab47: Reconcile with jb-mr2-release - do not merge * commit 'f1bfab47b89c8fab7811339c02848ee5a10ec335':