OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5dae7fd
7377c7b
)
resolved conflicts for merge of 7377c7be to jb-mr1-dev
author
Deepanshu Gupta
<deepanshu@google.com>
Tue, 13 May 2014 17:44:24 +0000
(10:44 -0700)
committer
Deepanshu Gupta
<deepanshu@google.com>
Tue, 13 May 2014 17:44:24 +0000
(10:44 -0700)
Change-Id: I26d2e3478536826608413094e17cd36da43b4e23
1
2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java
Simple merge
OSDN Git Service
