OSDN Git Service

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

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

Change-Id: I60eb783f06f0eb0c09c21ea6ec0fc10340ff63c6


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