| commit | 8ce54bd640ddab13416d7a105df63bf29df2ae45 | [log] [tgz] |
|---|---|---|
| author | Rob Fletcher <rfletch.vol@gmail.com> | Thu Mar 06 22:41:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 06 22:41:29 2014 +0000 |
| tree | 43ecc81f4892005696d7e086e94582dc5744da38 | |
| parent | a9d878ef67f54c878cef0868767ed8e9a5b8c063 [diff] | |
| parent | 04f3698345f804848ea7f03c6022dbdb0d8ac28d [diff] |
am 04f36983: (-s ours) am 549a39b4: DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946 * commit '04f3698345f804848ea7f03c6022dbdb0d8ac28d': DO NOT MERGE HTML injection fix for bluetooth pairing, issue 65946