diff options
| author | Doug Felt <dougfelt@google.com> | 2016-05-10 21:28:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-10 21:28:25 +0000 |
| commit | f6858e5f2d719cdd3c3bb7cf09748d4eb80334a3 (patch) | |
| tree | 00c2d064b89ddf86066ca414ff7dd7d611e470fb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 92c35129ef3bb3833c4c4670f4b6ef1de3cbee6e (diff) | |
| parent | 0a9c387847db52dfcfbb134916f51211560a290c (diff) | |
Merge "Remove rifle (1F946) from emoji font." into nyc-dev
am: 0a9c387847
* commit '0a9c387847db52dfcfbb134916f51211560a290c':
Remove rifle (1F946) from emoji font.
Change-Id: I0489385d7e578715613be1a0b6e3c8e087cd9119
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions