tree 98ab502174b76b2798b0a999c3ef0f97b1f105da
parent 28df02d79cf481cbe720f64f3ec42c9b8584329f
parent 2ef54a4f2b5e957c5767f44e826fe100ec9eec19
author Gopal Krishna Shukla <gshukla@codeaurora.org> 1474004797 +0000
committer android-build-merger <android-build-merger@google.com> 1474004797 +0000

Merge "Remove synchronization from getCurrentInputMethodSubtype()" am: 85539bed77 am: d3e1e473df am: e790c7b2fe
am: 2ef54a4f2b

Change-Id: I627dc54315c3dd5a958a89141dc999b40c921af6