tree d42be173a6d795a39e514db00d2ea1419d336d2a
parent 7a287e89291a87a3b08643d25af415379f99a8af
parent 7bf6a50b190cc59f95d5e0bbfd5f1cdb29c7f251
author Dianne Hackborn <hackbod@google.com> 1276549987 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276549987 -0700

am 7e900cbf: Merge "Update build version information." into gingerbread

Merge commit '7e900cbf1d600a8895e63a0247f45c116ff05172' into gingerbread-plus-aosp

* commit '7e900cbf1d600a8895e63a0247f45c116ff05172':
  Update build version information.