diff options
| author | Clay Murphy <claym@google.com> | 2014-07-17 21:04:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-17 02:39:43 +0000 |
| commit | 8a5e6cf7adeadecbde1362bd761a69af79cffd7e (patch) | |
| tree | 5b0644f0b997017decd27ca57fb24cfeb377a7ad | |
| parent | 0f08c6799754d86d38cd40ddf498d6aaf699f80e (diff) | |
| parent | ed461faab1f43e1bc8f3af88501e5a9d55e99355 (diff) | |
| download | source.android.com-8a5e6cf7adeadecbde1362bd761a69af79cffd7e.tar.gz | |
Merge "resolved conflicts for merge of faacd24c to master"
| -rw-r--r-- | src/devices/devices_toc.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/devices/devices_toc.cs b/src/devices/devices_toc.cs index a14554af..b20ea6da 100644 --- a/src/devices/devices_toc.cs +++ b/src/devices/devices_toc.cs @@ -124,7 +124,6 @@ <span class="en">Acknowledgements</span> </a> </li> - <li class="nav-section"> <div class="nav-section-header"> <a href="<?cs var:toroot ?>devices/tech/security/enhancements.html"> |