OSDN Git Service

am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 19:20:01 +0000 (19:20 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Apr 2014 19:20:01 +0000 (19:20 +0000)
commit492090a55e2fa94745aaf4e0e295845d8bb1351a
treefd2af7a97a0bb5a16e2a91d4b8c558f13b2e089a
parent35d46778f49c962c990cfc17e521aa80b9e0c016
parent16191f8c4fe92036c8ff2eecd4e57b4642068b99
am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev

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