diff options
author | David Friedman <dmail@google.com> | 2015-08-27 10:40:31 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-27 10:40:31 +0000 |
commit | 1ed472dc242a0990d87f8827b049c47c45a2cc8c (patch) | |
tree | 715d547d2502de8d04de0ec12233b3183ce62c99 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | db8d1c53cbeeef55855b643f0ce4928bc362f07c (diff) | |
parent | 8e79119ca2703b6ffd780a5314a4b6baf19908d8 (diff) |
am 8e79119c: (-s ours) am 6a21a5a1: am 9f4ddca9: am 56c22d29: Merge "Docs: Creating interactive watch faces Bug: 21721463" into mnc-preview-docs
* commit '8e79119ca2703b6ffd780a5314a4b6baf19908d8':
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions