OSDN Git Service

Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
authorFelipe Leme <felipeal@google.com>
Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 23 Jan 2018 21:46:43 +0000 (21:46 +0000)
commite14921216a5d03e8299f7b4ff86c9995d1c0218b
tree85b6844702e1cf07534c0ed0609c81e19ef2f6ea
parent0803f21c47d28bcd7b14eba37e7428239b3d668e
parent2eeab61b4c049501b014f44452bb6193ddf7fdb9
Merge "DO NOT MERGE - fix AFM.getComponentNameFromContext()" into oc-mr1-dev
am: 2eeab61b4c

Change-Id: Idda0d7fbc0f63bcbad44da6a46cef786770a2851
core/java/android/app/Activity.java
core/java/android/view/autofill/AutofillManager.java