am 61b040a5: resolved conflicts for merge of ea248d9c to lmp-mr1-ub-dev

Browse Source

* commit '61b040a57094093cfb090ebb1c321d4a69c20b64':
  Make sys_resource test more robust.

...

This commit is contained in:

Yabin Cui 2015-06-05 02:18:45 +00:00 committed by Android Git Automerger

parent c534603f8d 61b040a570

commit e997e9155e

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