OSDN Git Service

am 74e14827: am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of...
authorDeepanshu Gupta <deepanshu@google.com>
Wed, 16 Apr 2014 19:45:17 +0000 (19:45 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Apr 2014 19:45:17 +0000 (19:45 +0000)
commitcd9e9f4b43a88efd2c33b34534729ee280fc6bb2
tree29486f87832d0f78ef5d1bdbb4371c6ae44e6d1d
parent200479a9f582ba3a4a7d98985467f57ca90a77c9
parent74e14827cff43fee85970724ea9e4850316d2e11
am 74e14827: am 492090a5: (-s ours) am 16191f8c: resolved conflicts for merge of 0e2049cd to klp-modular-dev

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