OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d73c865 e265f35)
DO NOT MERGE Fix intent filter priorities am: 60351d3 am: 3dfc6d9 am: ca13384 -s...
authorTodd Kennedy <toddke@google.com>
Mon, 11 Apr 2016 22:32:47 +0000 (22:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 11 Apr 2016 22:32:47 +0000 (22:32 +0000)
am: e265f35  -s ours

* commit 'e265f35caa276035535f7546f01a91b4e072de0c':
  DO NOT MERGE Fix intent filter priorities

Change-Id: Ide1b16d642573c37bced4d293d91bf043bb0a78d


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help