commit | 48ea52800ac490b0c32c91b9982c7e01a455ffe5 | [log] [tgz] |
---|---|---|
author | Tadashi G. Takaoka <takaoka@google.com> | Thu Feb 06 09:14:08 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Feb 06 09:14:09 2014 +0000 |
tree | a9b43f2bf80b5a652635505179ad580935f3ef27 | |
parent | d645db1e37a376e71d56834033b82a07e6f387b8 [diff] | |
parent | d6f147e14293d717e94ae30f1f33750adec6b9c5 [diff] |
Merge "Consolidate keyOutputText with keyLabel attribute"