diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-10-07 04:56:47 +0000 | 
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-07 04:56:47 +0000 | 
| commit | a6abe30397cf1f67b871a3db7555aa7f0f9841d9 (patch) | |
| tree | 0b32cb18efd9ebd595400d86c8ac26b8edf5e2f5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | ddb8c4ee47e663ca984ff0291fae2cab2c5bc173 (diff) | |
| parent | 6d30f576146725ee81b8cb753584985a2758b566 (diff) | |
am 6d30f576: am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs
* commit '6d30f576146725ee81b8cb753584985a2758b566':
  docs: Update Common Intents page with Google Now actions
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions
