commit e80645d248c636475929fc6a33ca4eb0ed77d6ba
author Jamie Gennis <jgennis@google.com> Tue May 01 10:54:56 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 01 10:54:56 2012 -0700
tree 39f2d08a9f21cc2cb796b00f0884d55bfd74f1d8
parent 5a95bdaab2939d8f8a2b7657f1b63884781254b6
parent 190b6e2698dc47ddb4888b9c51abb23f69fcf064

am 190b6e26: ANativeWindow: fix up some comments

* commit '190b6e2698dc47ddb4888b9c51abb23f69fcf064':
  ANativeWindow: fix up some comments

init/builtins.c

diff --git a/init/builtins.c b/init/builtins.c
index 0b9c0cf..661c9b1 100644
--- a/init/builtins.c
+++ b/init/builtins.c
@@ -330,6 +330,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;
 }