OSDN Git Service

am 0d5de134: am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb...
authorAdam Cohen <adamcohen@google.com>
Fri, 17 Jan 2014 22:36:44 +0000 (14:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 Jan 2014 22:36:44 +0000 (14:36 -0800)
commit5489f34dd6db7a022f3daf56d9cd4765bc8d1f95
tree5650f073cf0ceeac77a72306410b09c570082788
parentcecb23d30a4cb52cef58abedb7393e284b819ebf
parent0d5de134258f71269a2d3b846521544bbad2a2eb
am 0d5de134: am 5ac62d69: Merge "Fix overlapping pages (issue 12551580)" into jb-ub-now-kermit

* commit '0d5de134258f71269a2d3b846521544bbad2a2eb':
  Fix overlapping pages (issue 12551580)