OSDN Git Service

am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Jun 2014 20:35:12 +0000 (20:35 +0000)
* commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]


Trivial merge