OSDN Git Service

am 252dfcbb: am b755f9a3: Do not grow if we are invoked for an external allocation.
authorCarl Shapiro <cshapiro@google.com>
Tue, 28 Sep 2010 21:00:06 +0000 (14:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 28 Sep 2010 21:00:06 +0000 (14:00 -0700)
Merge commit '252dfcbbc8ab27ba7f86908fbf8c13425d166a70'

* commit '252dfcbbc8ab27ba7f86908fbf8c13425d166a70':
  Do not grow if we are invoked for an external allocation.


Trivial merge