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:
381f8a9
1d01f9c
)
Merge "Rename CompatibilityDisplay to Vr2dDisplay" into oc-dev
author
Karthik Ravi Shankar
<karthikrs@google.com>
Thu, 4 May 2017 05:23:42 +0000
(
05:23
+0000)
committer
android-build-merger
<android-build-merger@google.com>
Thu, 4 May 2017 05:23:42 +0000
(
05:23
+0000)
am:
1d01f9cf67
Change-Id: I4072d3d1ccd258473ccc35412dd3b002e0239f2d
1
2
services/core/java/com/android/server/am/ActivityManagerService.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge