summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/display
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-12-05 12:28:17 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-12-05 12:28:17 -0800
commitfb21aa84a804c8d7dd0aad7df1e4a336ed59f991 (patch)
tree35ea48a0839d11206817939a39ed7aba86c31922 /services/java/com/android/server/display
parent1c328df48217616bf2975c7d38e8884b23cd306c (diff)
parent8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1 (diff)
downloadframeworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.zip
frameworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.tar.gz
frameworks_base-fb21aa84a804c8d7dd0aad7df1e4a336ed59f991.tar.bz2
am 8ec9f8f0: am dc5b21a5: am 487f8e93: Merge "Fix an issue on installing 3rd-party IME by a non-primary user" into jb-mr1.1-dev
* commit '8ec9f8f074ea35cad6e6a75a87e4bde947f12ea1': Fix an issue on installing 3rd-party IME by a non-primary user
Diffstat (limited to 'services/java/com/android/server/display')
0 files changed, 0 insertions, 0 deletions