OSDN Git Service

am 63b62e8c: am 66ad04bc: Merge "Remove incompatible ashmem.h"
authorDima Zavin <dima@android.com>
Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 Nov 2013 20:36:54 +0000 (12:36 -0800)
* commit '63b62e8cd48176abbfddb6bd67c138ae447f6ac7':
  Remove incompatible ashmem.h


Trivial merge