OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5b4d6e 40b5456)
am 40b54563: am 07f8da65: am 888461c8: resolved conflicts for merge of 1103ece2 to...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 16:41:50 +0000 (16:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 16:41:50 +0000 (16:41 +0000)
* commit '40b54563743c3bab92ee7086f8a2b159ecef5453':
  Fix layoutlib [DO NOT MERGE]


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