commit | 8c20aacfb4388c9c1147246a9d987286923798fd | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Wed Mar 25 00:21:20 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Mar 25 00:21:20 2015 +0000 |
tree | b0a48d6f950b65adaf1ff5d8720cfe646a5c7f18 | |
parent | 0393f4d066de055fe2dea6d1c548ae09c6f38fd6 [diff] | |
parent | 590656314faa267aba787102fd7c673e25710039 [diff] |
am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev automerge: 5906563 -s ours * commit '590656314faa267aba787102fd7c673e25710039': Fix project settings. [DO NOT MERGE]