commit | 4e85476740104ae4b91c3d22df2fb0ee4ecd5c5b | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Fri Feb 07 09:53:35 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Feb 07 09:53:35 2014 +0000 |
tree | 6036aeb0b9703383d5461b48df63f46e587d7a99 | |
parent | a9e1db6636c69a9bf3c1a7bd6753781dd68bff0f [diff] | |
parent | a83a1feb62c4b4ff1a7cf5b6f58ad115491de76f [diff] |
Merge "Consolidate keyIcon and code with keyLabel attribute"