OSDN Git Service

[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs,...
authorNan Zhang <nanzhang@google.com>
Fri, 8 Jun 2018 17:38:34 +0000 (10:38 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 8 Jun 2018 17:38:34 +0000 (10:38 -0700)
commit8ffbeb187727cb27bb13d6a207881a37b2b3a0d5
treecfe2ce3bfb74ebb824190dabb95e1d851647d325
parentb779f340957da20b2ae53a5864e2d1b96ef119ce
parentcb3dd2889cba3759f6a8392d9cccb37702186b18
[automerger skipped] Merge "Enabled annotations for api-stubs, system-api-stubs, and test-api-stubs" into pi-dev
am: cb3dd2889c  -s ours

Change-Id: I667ac3fca83f1a4d8633903d877e7fe52765b6fd