OSDN Git Service

am 2d4bdb52: (-s ours) am 82d5861e: am f2f31a63: am 8275abe7: (-s ours) am 5583758a...
authorBaligh Uddin <baligh@google.com>
Mon, 5 Nov 2012 23:57:59 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:57:59 +0000 (15:57 -0800)
* commit '2d4bdb522769183b606d688b975555a52eb44140':


Trivial merge