commit | 590656314faa267aba787102fd7c673e25710039 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Mar 25 00:08:28 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 25 00:08:28 2015 +0000 |
tree | 9c679d4fc5adb8825434480df575c7563e55beec | |
parent | 92d46e594b11cd9abec541bfb5c59267b5e9c540 [diff] | |
parent | dbb38b30612dc054ba3bf066f8528cccfceb47ad [diff] |
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev * commit 'dbb38b30612dc054ba3bf066f8528cccfceb47ad': Fix project settings. [DO NOT MERGE]