| commit | f4ba648eb1439fab126ca6a943cd8d2e8eb8ddbd | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Tue Mar 05 15:58:53 2013 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 05 15:58:53 2013 +0000 |
| tree | 25ad5112b9963cd7f6f822690ad1c7f8afef9ef6 | |
| parent | 558f51013502ad9be4bdd08f78f897ff4a71e460 [diff] | |
| parent | 3c078da2f2326ffbed87fc99ba4842d0e8aee6e4 [diff] |
am 3c078da2: (-s ours) Reconcile with jb-mr2-release - do not merge * commit '3c078da2f2326ffbed87fc99ba4842d0e8aee6e4':