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