| commit | 280ab2e580811b968be8505dee7f346b42874319 | [log] [tgz] |
|---|---|---|
| author | Rob Fletcher <rfletch.vol@gmail.com> | Fri Mar 07 03:02:59 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 07 03:02:59 2014 +0000 |
| tree | 0afd3cbaf86647e7828fc00a712b700859ed77d0 | |
| parent | 03f5624c8df7ed8cf112941c9b96e4de5286a87c [diff] | |
| parent | d58459cbb9d7949136d0646627502cc5ba466154 [diff] |
am d58459cb: (-s ours) am 99fa7336: am 8ce54bd6: am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 * commit 'd58459cbb9d7949136d0646627502cc5ba466154': DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946