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

Browse Source

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

...

This commit is contained in:

Deepanshu Gupta

2014-04-16 19:38:38 +00:00

committed by Android Git Automerger

parent 5a3df66fe8 492090a55e

commit 74e14827cf

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