OSDN Git Service

am 488978de: am f33e4b6f: GraphicBufferAlloc class was declared twice
authorMathias Agopian <mathias@google.com>
Fri, 21 Sep 2012 03:31:13 +0000 (20:31 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Sep 2012 03:31:13 +0000 (20:31 -0700)
* commit '488978deda3490056d1d9f6bbeb2c838114c329b':
  GraphicBufferAlloc class was declared twice


Trivial merge