tree dc58d5d4809d5e348fc4cf1a15cf4a2b9d41b603
parent edc22bf307e4eb87bc3ad5132e4fbaebb1a7f4d2
parent 531975da75192f0c2a1e1452999ecd5475888b3c
author akirilov <akirilov@google.com> 1523384594 -0700
committer android-build-merger <android-build-merger@google.com> 1523384594 -0700

[automerger skipped] RESTRICT AUTOMERGE: Prevent reporting fake package name - framework (backport to oc-dev) am: e5776af814
am: 531975da75  -s ours

Change-Id: I3df7a9b0722b57c3059ec86ede4e93652404df61