tree 8cba418f8fa5d971dc1b86c80a2734260463c215
parent 18ddfcdb0ff403e1e7db3fc2f9c344e3f305ae35
parent 6006a88e54e574cb2a08dd1daa5171530b7d0dda
author Adrian Roos <roosa@google.com> 1475104584 +0000
committer android-build-merger <android-build-merger@google.com> 1475104584 +0000

Merge "DirectReply: Prevent closing the IME window on reinflation" into nyc-mr1-dev
am: 6006a88e54

Change-Id: Iab06e3e6a4a9b7bf3e9360bcdee52a6be440298e