diff options
author | Robert Greenwalt <rgreenwalt@google.com> | 2012-10-02 15:49:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 15:49:58 -0700 |
commit | 98ec56604dc3d150e47e1605b33a4ae40dbc7f5c (patch) | |
tree | fb824ad76b72aaa3c70fe8501f85906e1121a087 /services/java/com/android/server/display/LocalDisplayAdapter.java | |
parent | a22f081ab41072b5aa8caa3d1179d2ad27a877f7 (diff) | |
parent | 5def66ed84f08faefd0f7db21ea2943dde3f4830 (diff) |
Merge "Re-add default sms_short_codes." into jb-mr1-dev
Diffstat (limited to 'services/java/com/android/server/display/LocalDisplayAdapter.java')
0 files changed, 0 insertions, 0 deletions