tree b2a556e25f3c8f2e36d5a409ea617d977cccc885
parent f6dc387a2e5bed68c18108fab3dff96dbc9b5007
parent 36d8b3eafd8b315e79e84d4e7f8cfc40afc3a255
author Conley Owens <cco3@android.com> 1350511759 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350511759 -0700

am 36d8b3ea: Merge "Set the file timestamp using the device info."

* commit '36d8b3eafd8b315e79e84d4e7f8cfc40afc3a255':