OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2f8da10 e74d437)
am e74d437a: am c5c49dcd: am 8b78a1d7: am 9f00e655: resolved conflicts for merge...
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:21:01 +0000 (18:21 +0000)
* commit 'e74d437a172e69e0d758b2df055fea55a14009e4':
  Optimize layout rendering in layoutlib [DO NOT MERGE]


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