| commit | 47c5e9c831dcf43b1e874b2485147e7fe58da503 | [log] [tgz] |
|---|---|---|
| author | Matthew Xie <mattx@google.com> | Thu Feb 27 21:46:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 27 21:46:26 2014 +0000 |
| tree | 92fb751ca2774fdfdd2dda2ab7b372d9d2d9494e | |
| parent | adda1b0022f12dd15a802ec36e6efee0f9c6bff2 [diff] | |
| parent | 31df7cdcb31993c4c62bd1995af72fca57946e10 [diff] |
am 31df7cdc: am b1140053: am 85fb88ee: Merge "HTML injection fix for bluetooth pairing, issue 65946" * commit '31df7cdcb31993c4c62bd1995af72fca57946e10': HTML injection fix for bluetooth pairing, issue 65946