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

Browse Source

* commit 'e997e9155e72f1b0b40d832ac91fd39951acc1b9':
  Make sys_resource test more robust.

...

This commit is contained in:

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

parent 1385421573 e997e9155e

commit eb641b0d4a

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