From: TreeHugger Robot <treehugger-gerrit@google.com>
Date: Mon, 24 Apr 2017 15:35:44 +0000 (+0000)
Subject: Merge "Remove @TestApi annotation" into oc-dev
X-Git-Tag: android-x86-9.0-r1~1044^2~1512
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ab9119f507d0b85e79d6098bf2055476683afb6;p=android-x86%2Fframeworks-base.git

Merge "Remove @TestApi annotation" into oc-dev
---

1ab9119f507d0b85e79d6098bf2055476683afb6