OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3e7f0a2 14788ef)
am 14788ef3: am f8c56858: resolved conflicts for merge of 727ad350 to jb-mr1.1-dev
authorDeepanshu Gupta <deepanshu@google.com>
Tue, 13 May 2014 18:41:57 +0000 (18:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 13 May 2014 18:41:57 +0000 (18:41 +0000)
* commit '14788ef3e70faed432b7bf643771d126d50a59c7':
  Fix visitFieldInsn in layoutlib_create. [DO NOT MERGE]


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