OSDN Git Service

(root) / android-x86 / frameworks-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: a2968ad) | patch
Fixing build breakage
authorStefan Kuhne <skuhne@google.com>
Mon, 18 May 2015 23:26:46 +0000 (16:26 -0700)
committerStefan Kuhne <skuhne@google.com>
Mon, 18 May 2015 23:26:46 +0000 (16:26 -0700)
commit63b007e651f7b487b09f42f13fe03e0327edea6f
treeb738d9181cbab73d2c95aa54e0959d5c2e9ef873tree | snapshot
parenta2968ad51e36190ad8042ec330237905bc7fe5c1commit | diff
Fixing build breakage

There was a merge conflict due to 2 overlapping CL's.

Bug: 20763296
Change-Id: Ib5e8476587dfd1354d288150501771df4b3b7ec8
services/core/java/com/android/server/am/ActivityManagerService.java diff | blob | history
frameworks/base
About OSDN
Find Software
Develop Software
Help