OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b5971ef 77917a8)
Merge "add workaround for annotations dependency conflict with espresso" into nyc-dev
authorScott Main <smain@google.com>
Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Aug 2016 15:47:18 +0000 (15:47 +0000)
am: 77917a835f

Change-Id: Id3b88a94a23de579c20757f038dd83c0645e67bc


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