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:
1fb01d9
5ff7efa
)
am 5ff7efa2: Merge "Appease the simians" into jb-dev
author
Adam Powell
<adamp@google.com>
Tue, 15 May 2012 21:56:21 +0000
(14:56 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Tue, 15 May 2012 21:56:21 +0000
(14:56 -0700)
* commit '
5ff7efa253486b2b482031ab9a3714fc5cc10f7f
':
Appease the simians
1
2
policy/src/com/android/internal/policy/impl/PhoneWindow.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
policy/src/com/android/internal/policy/impl/PhoneWindow.java
Simple merge