am dbb38b30: (-s ours) am cbb4ec78: am 6f5fac81: Merge "Fix project settings. [DO NOT MERGE]" into lmp-dev

Browse Source

automerge: 5906563  -s ours

* commit '590656314faa267aba787102fd7c673e25710039':
  Fix project settings. [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2015-03-25 00:21:20 +00:00

committed by android-build-merger

parent 0393f4d066 590656314f

commit 8c20aacfb4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available