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:
4334714
6c1dbd5
)
Merge "Clean up dangling bitmaps." into nyc-mr1-dev
author
Makoto Onuki
<omakoto@google.com>
Tue, 10 May 2016 20:57:02 +0000
(20:57 +0000)
committer
Android (Google) Code Review
<android-gerrit@google.com>
Tue, 10 May 2016 20:57:04 +0000
(20:57 +0000)
1
2
services/core/java/com/android/server/pm/ShortcutService.java
patch
|
diff1
|
diff2
|
blob
|
history
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/core/java/com/android/server/pm/ShortcutService.java
Simple merge
diff --cc
services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java
Simple merge