tree 194d408f23e1c7437ca66ab6a956726e26c8bceb
parent d9497f7dd98da28da320ac2231c6e94a243ce257
parent 82c3ef7adc235e857736b09864c2aa81d41d7132
author Android (Google) Code Review <android-gerrit@google.com> 1253145966 -0400
committer Android (Google) Code Review <android-gerrit@google.com> 1253145966 -0400

Merge change 25325 into eclair

* changes:
  Add a parcelable version of UUID file.