tree 9255f48805e81eca031d14d527c26e862b064f00
parent 0209524bd47351d43e0403d10ecd94c2c3464b0b
parent b1dca78a7403a1603edb6b0a993a33bb4d6478d2
author Andrew Hsieh <andrewhsieh@google.com> 1345466401 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345466401 -0700

am b1dca78a: am 11489016: am 7f26cea9: Merge "Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent w

* commit 'b1dca78a7403a1603edb6b0a993a33bb4d6478d2':
  Update stdint.h; Refresh <arch>/include/machine/*   stdint.h: https://android-review.googlesource.com/#/c/41714/             https://android-review.googlesource.com/#/c/40576/   <arch>/include/machine/*: to be consistent with      bionic/libc/<arch>/include/machine/*