OSDN Git Service

resolved conflicts for merge of 2d280f75 to ics-mr1
authorJeff Brown <jeffbrown@google.com>
Sun, 30 Oct 2011 21:24:02 +0000 (14:24 -0700)
committerJeff Brown <jeffbrown@google.com>
Sun, 30 Oct 2011 21:24:02 +0000 (14:24 -0700)
commit9897b4613881b272b5a0ce82eb127d2350550dad
tree0394c445c27c2dde78ef2b06bb4d4a30a3ae4ce4
parent1e6a30e6bd6b6f1bc3b46051c7828fef7580bbdd
parent6d42e13be4c7c7c42e6ba16cc4cd041a7b1e5f85
resolved conflicts for merge of 2d280f75 to ics-mr1

Change-Id: I459e1cb0b60fb94dfb12862fedb9f8d949c226a7
libs/binder/CursorWindow.cpp