| commit | b32cd38d6ca493eca21a8538649e833a271ea980 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 20 16:46:46 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 20 16:46:46 2013 +0000 |
| tree | d66ce5a2234839de7f58d7d3611f3e4c209e0aa6 | |
| parent | c6b097a06775cfcb7defcaefbea424b9651ababb [diff] | |
| parent | 67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e [diff] |
am 67436bf1: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e':