OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20fc473 edc8b85)
am edc8b857: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into...
authorDeepanshu Gupta <deepanshu@google.com>
Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Sep 2014 02:01:59 +0000 (02:01 +0000)
* commit 'edc8b8579ba9f47bbca0ac0c2f0eb11d0eadab09':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]


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