OSDN Git Service

am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Jun 2014 20:53:49 +0000 (20:53 +0000)
commit76364c6970f86bdf67622c14c9f1ebac6883998b
treec19465374a69d9f1fe7260d6a184eb3a60ee941f
parent236b71649ce008578cf77557033df322e93a1e17
parentd0f215756aa3767db8a73ece7fe9f401256dd263
am d0f21575: (-s ours) am 3c1d72c2: am ab869de1: am cd192c0b: am 704954c9: am 5f56ea8d: am f48ab8fe: am 3b7c09b4: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]

* commit 'd0f215756aa3767db8a73ece7fe9f401256dd263':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]