tree 879f85c104f65352660fc0b5a89be6e6744f1873
parent 2e8c9e1b0b0fec25b357d12c2af42853fff35726
parent 3400286c9a4d25ba2cbc2522ca7a74cd916c5427
author Tor Norbye <tnorbye@google.com> 1363976503 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363976503 -0700

am 3400286c: Merge "Fix project files for DeviceConfig"

* commit '3400286c9a4d25ba2cbc2522ca7a74cd916c5427':
  Fix project files for DeviceConfig