commit 2717620873fa1936779662a96de05033b89ddb19
author Dan Albert <danalbert@google.com> Fri Apr 17 16:47:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 17 16:47:01 2015 +0000
tree ff9cdb8ac0f16eac4a8741f71dcb2307d86d8ffe
parent 3a5602ebb8c365c252b6b9a6284996015d92ca33
parent 27ccb75af78f2fe9bf05f9141b5470fd3c0eeeba

Merge "Clean up sanitizer configuration."

target/product/core_base.mk

diff --git a/target/product/core_base.mk b/target/product/core_base.mk
index 6c29482..03d33e1 100644
--- a/target/product/core_base.mk
+++ b/target/product/core_base.mk
@@ -41,13 +41,14 @@
     libstagefright_soft_amrdec \
     libstagefright_soft_amrnbenc \
     libstagefright_soft_amrwbenc \
+    libstagefright_soft_avcdec \
+    libstagefright_soft_avcenc \
     libstagefright_soft_flacenc \
     libstagefright_soft_g711dec \
     libstagefright_soft_gsmdec \
-    libstagefright_soft_h264dec \
-    libstagefright_soft_h264enc \
     libstagefright_soft_hevcdec \
     libstagefright_soft_mp3dec \
+    libstagefright_soft_mpeg2dec \
     libstagefright_soft_mpeg4dec \
     libstagefright_soft_mpeg4enc \
     libstagefright_soft_opusdec \

tools/droiddoc/templates-sac/head_tag.cs

diff --git a/tools/droiddoc/templates-sac/head_tag.cs b/tools/droiddoc/templates-sac/head_tag.cs
index 9fca488..5cee68c 100644
--- a/tools/droiddoc/templates-sac/head_tag.cs
+++ b/tools/droiddoc/templates-sac/head_tag.cs
@@ -7,7 +7,7 @@
 <title><?cs 
   if:page.title ?><?cs 
     var:page.title ?> | <?cs
-  /if ?>Android Developers</title>
+  /if ?>Android Open Source Project</title>
 
 <!-- STYLESHEETS -->
 <link rel="stylesheet"