am 74e14827: am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev

Browse Source

* commit '74e14827cff43fee85970724ea9e4850316d2e11':
  Layoutlib tests now check methods return value [DO NOT MERGE]

...

This commit is contained in:

Deepanshu Gupta

2014-04-16 19:45:17 +00:00

committed by Android Git Automerger

parent 200479a9f5 74e14827cf

commit cd9e9f4b43

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