OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c6248c a82db08)
am a82db08e: (-s ours) am e73e14fd: am 8ed784e2: am edc8b857: Merge "Fix "@null"...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 17:14:46 +0000 (17:14 +0000)
* commit 'a82db08e1d5f2c7b1751a93bc10d0fc5d231f9e4':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]


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