am 15db3551: (-s ours) resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp

Browse Source

* commit '15db3551d005a58407a8ac97b73a879530dd3e74':
  resolved conflicts for merge of 074ee014 to mnc-dev-plus-aosp

...

This commit is contained in:

Daniel Rosenberg 2015-08-27 11:39:18 +00:00 committed by Android Git Automerger

parent b4bb346e4c 15db3551d0

commit b94b4f1ad5

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

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

Diff Content Not Available