tree 518dc79eca47892a2d69747cb6e5e30c49ab2f9e
parent 901fc12fcbb9c80f8789f780b0c085500dde0022
parent d4625066eb79dcf356909a186970319776031aba
author Costin Manolache <costin@google.com> 1273716694 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273716694 -0700

am c1959658: am fa2e3dcd: am 8ea9f130: Merge "Bug 2680071: Rename the Cloud to Device" into froyo