OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f3603fe 2deb31f)
am 2deb31ff: am f1973ae2: am a1cca5cb: am 29b4986e: (-s ours) am 5c77c126: am b6588c5...
authorDeepanshu Gupta <deepanshu@google.com>
Fri, 4 Apr 2014 02:26:33 +0000 (02:26 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Apr 2014 02:26:33 +0000 (02:26 +0000)
* commit '2deb31ffbe4ce6fc3552f35847b2e02a0d938f1e':
  Fix NPE in layoutlib. [DO NOT MERGE]


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