OSDN Git Service

am f588772b: Merge changes I9347ab44,I3f080b34
authorJean-Baptiste Queru <jbq@google.com>
Tue, 11 Jan 2011 22:56:52 +0000 (14:56 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 11 Jan 2011 22:56:52 +0000 (14:56 -0800)
commit6bf5bce64439f196a131cb94f48ba785ee483e99
tree5f2dd8e41152fd9235f92ad8b3f1f4e29c6d32d2
parent3c56ce497d1ea3baa6406c49be82c1245fda2443
parentf588772b05c35f19e25404bedc7890289de7c4b9
am f588772b: Merge changes I9347ab44,I3f080b34

* commit 'f588772b05c35f19e25404bedc7890289de7c4b9':
  use consistent guards for off_t and size_t defines for IA
  Simplify variable typing for IA builds