| commit | 640ad668e9d8b52433e66d9062dbe4acb752764a | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jun 14 12:37:53 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jun 14 12:37:53 2013 -0700 |
| tree | d3c0442a4a690c0529233883b77ba3afcb870418 | |
| parent | 051a1740eb434e317451c09b72ae09c81cbfa1c1 [diff] | |
| parent | 9bfdf4d539d011f0be59370d61dcbf257b3ae578 [diff] |
am 9bfdf4d5: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '9bfdf4d539d011f0be59370d61dcbf257b3ae578': JWR66M