am d2117974: (-s ours) resolved conflicts for merge of 486645ee to mnc-dev-plus-aosp

Browse Source

* commit 'd2117974e4c22ff6b8967c3b5cd2d497a6ffc856':

...

This commit is contained in:

Elliott Hughes 2015-08-27 11:49:42 +00:00 committed by Android Git Automerger

parent 9b3b9002de d2117974e4

commit 5d238ddc15

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