OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b97ac2b 2a57694)
am 2a57694d: (-s ours) am e2edd753: am 76364c69: am d0f21575: (-s ours) am 3c1d72c2...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 3 Jun 2014 21:06:02 +0000 (21:06 +0000)
* commit '2a57694d0ae30eeca7239c7efae4e6bf478b781a':
  LayoutLib: Correctly resolve ?attr/foo [DO NOT MERGE]


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help