am 1a63ee0b: am 15549af0: (-s ours) am af496633: (-s ours) Add save/load for the user-made Layout Devices. (do not merge)
Merge commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad' into eclair-mr2-plus-aosp * commit '1a63ee0bbb10ecb666a5953dd1e1d0e1578157ad': Add save/load for the user-made Layout Devices. (do not merge)
This commit is contained in: