OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 889ec19 0ff5117)
am 0ff5117f: am 7055778e: am a9f56d5a: (-s ours) am 44db2b3e: am 5d1755e9: am c634383...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 18:10:50 +0000 (18:10 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 18:10:50 +0000 (18:10 +0000)
* commit '0ff5117fb3aebfd64ffe26ff68308632c7ceeb3d':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]


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