commit 46f9223b994c50e44354566375da2ec95bebc04c
author Jeff Tinker <jtinker@google.com> Tue May 01 15:13:27 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 01 15:13:27 2012 -0700
tree 07c20f94d294466ceee082972d3ecba67452c183
parent 048cc27c8a6796f9b2ce9d58be8c423ab837cf8b
parent 94a55df34d917492cb3613b9445ffb1659459186

am 94a55df3: Merge "Fix failure to play pinned movies" into jb-dev

* commit '94a55df34d917492cb3613b9445ffb1659459186':
  Fix failure to play pinned movies

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index a7e34a6..ac9585e 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -332,6 +332,7 @@
     unsigned flag;
 } mount_flags[] = {
     { "noatime",    MS_NOATIME },
+    { "noexec",     MS_NOEXEC },
     { "nosuid",     MS_NOSUID },
     { "nodev",      MS_NODEV },
     { "nodiratime", MS_NODIRATIME },

libpixelflinger/fixed.cpp

diff --git a/libpixelflinger/fixed.cpp b/libpixelflinger/fixed.cpp
index 5b92062..5094537 100644
--- a/libpixelflinger/fixed.cpp
+++ b/libpixelflinger/fixed.cpp
@@ -62,7 +62,8 @@
     int shift;
     x = gglRecipQNormalized(x, &shift);
     shift += 16-q;
-    x += 1L << (shift-1);   // rounding
+    if (shift > 0)
+        x += 1L << (shift-1);   // rounding
     x >>= shift;
     return x;
 }