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:
629f766
73e78c7
)
am 73e78c75: am af42a91c: Fix another build breakage.
author
Narayan Kamath
<narayan@google.com>
Fri, 11 Apr 2014 11:37:40 +0000
(11:37 +0000)
committer
Android Git Automerger
<android-git-automerger@android.com>
Fri, 11 Apr 2014 11:37:40 +0000
(11:37 +0000)
* commit '
73e78c75b770b3af0d48acac9c8565f7b4d035ff
':
Fix another build breakage.
1
2
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java
Simple merge