tree 71a1ac86242080360d137c08bd3284ea0fd7e68c
parent 26f672a94cdc7cf8ff04745cc1a42b0e2acdf9e4
parent 71518174fcd57c85d1e38f1794c44b763baff286
author Deepanshu Gupta <deepanshu@google.com> 1426121170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1426121170 +0000

am 71518174: Merge "Fix project settings." into lmp-mr1-dev

* commit '71518174fcd57c85d1e38f1794c44b763baff286':
  Fix project settings.