| commit | dfac5b91416e652a26db222e1f52678d81155b33 | [log] [tgz] |
|---|---|---|
| author | Deepanshu Gupta <deepanshu@google.com> | Wed Mar 25 00:29:57 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 00:29:57 2015 +0000 |
| tree | fb577766e277d01d9c3e5cef8c7e6a9a09c38992 | |
| parent | 3ae0bc032ae52db536f19d4468d08941b851d8a6 [diff] | |
| parent | 73a92bd7d12c257735ccfd8bb763f7b3fdbab834 [diff] |
am 73a92bd7: (-s ours) am 83ba89e9: am 3deade59: am dbb38b30: am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev * commit '73a92bd7d12c257735ccfd8bb763f7b3fdbab834': Fix project settings. [DO NOT MERGE]