am 5c67ce0b: resolved conflicts for merge of 17bfc712 to master-nova-dev

Browse Source

* commit '5c67ce0ba19575ee8dc838a955f1889be8181330':

...

This commit is contained in:

Santos Cordon

2014-05-13 15:17:48 +00:00

committed by Android Git Automerger

parent 65b1fc2a89 5c67ce0ba1

commit a34f5c6358

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