tree c0d5ef72ed1833aa5fcb158c280ae76d4855f180
parent 4a054c1a5d7ee2db6c738ede002a35145b226588
parent 997dc32b6bef1c9cc8ac6d4d598698507b2c4934
author Doug Zongker <dougz@android.com> 1281990005 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281990005 -0700

am 997dc32b: Merge "add an api for getting a device serial number" into gingerbread

Merge commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934' into gingerbread-plus-aosp

* commit '997dc32b6bef1c9cc8ac6d4d598698507b2c4934':
  add an api for getting a device serial number