tree 0d9e03791e9c5ca89ae4e7a54eddc14a2aa45110
parent 5a3df66fe887aaa0dfa0a48c289ce3078dc34371
parent 492090a55e2fa94745aaf4e0e295845d8bb1351a
author Deepanshu Gupta <deepanshu@google.com> 1397677118 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1397677118 +0000

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

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