OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b79bb54 5d1755e)
am 5d1755e9: am c634383a: (-s ours) am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 17:22:10 +0000 (17:22 +0000)
* commit '5d1755e9f51f81d54a3566aa6304919fbf467091':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]


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