tree c2eae1267c5fd174d54f17307e4afd4dc331b749
parent 44fea60376e4e851b07eb365fd581c5b9404611f
parent 6092c044aaee2e27f6d0a469f1a314b48292a722
author Deepanshu Gupta <deepanshu@google.com> 1427241137 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1427241138 +0000

Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev