am 8b93ce0f: (-s ours) DO NOT MERGE - resolved conflicts for merge of 97e88d58 to lmp-mr1-ub-dev

Browse Source

* commit '8b93ce0f73af7dd41abc1e7ac85cf0dda4eaeeb9':
  LocalSocketTest.testAccessors: fix the *SendBufferSize* test

...

This commit is contained in:

Daniel Xie

2015-06-06 00:05:48 +00:00

committed by Android Git Automerger

parent d2e884590d 5aa28eadc3

commit 8411eed10d

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