| commit | d58459cbb9d7949136d0646627502cc5ba466154 | [log] [tgz] |
|---|---|---|
| author | Rob Fletcher <rfletch.vol@gmail.com> | Thu Mar 06 22:56:39 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 22:56:39 2014 +0000 |
| tree | dc86debfc853366f6da23cacf6f7fa72521ee5dd | |
| parent | 31df7cdcb31993c4c62bd1995af72fca57946e10 [diff] | |
| parent | 99fa73361fd7a562b7ea193cd047604e902d6b2f [diff] |
am 99fa7336: am 8ce54bd6: am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 * commit '99fa73361fd7a562b7ea193cd047604e902d6b2f': DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946