OSDN Git Service

am 33822312: am 55da6228: (-s ours) am 14424043: am 369a0057: Merge "Update ViewRootI...
authorBen Murdoch <benm@android.com>
Thu, 3 Apr 2014 17:00:41 +0000 (17:00 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 3 Apr 2014 17:00:41 +0000 (17:00 +0000)
* commit '33822312e65a38400b189c6deda59b8d047b89cf':
  Update ViewRootImpl for 64bit functor type.


Trivial merge