OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 253051c 760b557)
Merge "Don\'t assert on uris with stack." into nyc-dev
authorSteve McKay <smckay@google.com>
Tue, 31 May 2016 22:10:07 +0000 (22:10 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 31 May 2016 22:10:07 +0000 (22:10 +0000)
am: 760b557158

* commit '760b5571582056e756d9fb1bc366247bc26a8e54':
  Don't assert on uris with stack.

Change-Id: Id18689de7d04ae2627ea64612fe7fd8f2ac5f445


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