OSDN Git Service

am 15549af0: (-s ours) am af496633: (-s ours) Add save/load for the user-made Layout...
authorXavier Ducrohet <xav@android.com>
Sat, 17 Oct 2009 01:08:18 +0000 (18:08 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 17 Oct 2009 01:08:18 +0000 (18:08 -0700)
Merge commit '15549af01e6d1d62b56e825800191d223c4f29a2' into eclair-mr2

* commit '15549af01e6d1d62b56e825800191d223c4f29a2':
  Add save/load for the user-made Layout Devices. (do not merge)


Trivial merge