tree 77f5ecbf651c46c695ff2eac3ef356e2addb1f17
parent 6560d8845be38806ccbfb9851bdb67bedd2e2660
parent 1e8f451bbfceb4298915905a799ff7b2f3f245cd
author Hyunyoung Song <hyunyoungs@google.com> 1493681328 +0000
committer android-build-merger <android-build-merger@google.com> 1493681328 +0000

Merge "Add @TestApi annotation to AdaptiveIconDrawable" into oc-dev
am: 1e8f451bbf

Change-Id: I9d95fdcd56ccf99fe497b68f85fd5db036548a83