tree d8082703b20b25e3ad066907abbcfcdc3040c59e
parent 6afc66d2f89650f918690b5461c642e0d29d999e
parent e59d0522bc9937df9c29651a0bd9c8c1137011b2
author Tor Norbye <tnorbye@google.com> 1363976621 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363976621 -0700

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

* commit 'e59d0522bc9937df9c29651a0bd9c8c1137011b2':
  Fix project files for DeviceConfig