commit | 236b71649ce008578cf77557033df322e93a1e17 | [log] [tgz] |
---|---|---|
author | Deepanshu Gupta <deepanshu@google.com> | Tue Jun 03 20:35:12 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jun 03 20:35:12 2014 +0000 |
tree | c19465374a69d9f1fe7260d6a184eb3a60ee941f | |
parent | 02d88f7b350e166da3b1f480c912351a5c72d00c [diff] | |
parent | 0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4 [diff] |
am 0ab0d875: (-s ours) am 28f550f0: am 03a83266: am 08d2007b: LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE] * commit '0ab0d875d46d6d8974c9cf3ea5856dcfb557e9a4': LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]