OSDN Git Service

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

Change-Id: Ifff17568fd5ac67443fa7cfbbb0526f0b16b3c34


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