tree 9844a01b4f2a2fffd4f0e02b7b60104ec83804a2
parent 169bc15b254d792670746d909b27e4b7748acab6
parent e14921216a5d03e8299f7b4ff86c9995d1c0218b
author Felipe Leme <felipeal@google.com> 1516744365 +0000
committer android-build-merger <android-build-merger@google.com> 1516744365 +0000

Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev am: 2eeab61b4c
am: e14921216a  -s ours

Change-Id: I4e485a49a8944c46f3c4ce45040194b6f53195ae