tree 573455a586cd91599c9d3d88a3747b626ab76ee8
parent ce2b74f729ea79b86a69cd3f8dd505aa93d0025b
parent 3deade5981372fc44e83c161c7d0dbb9df529e3f
author Deepanshu Gupta <deepanshu@google.com> 1427242539 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427242539 +0000

am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

* commit '3deade5981372fc44e83c161c7d0dbb9df529e3f':
  Fix project settings. [DO NOT MERGE]