diff options
author | Sarah Maddox <sarahmaddox@google.com> | 2015-01-26 20:42:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-01-26 20:42:57 +0000 |
commit | 77a7feac6c8832f8162d2339925a12434186eac2 (patch) | |
tree | be703d8dd460179e0c4620b80533cb0035f024d9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2322ea558eced3deed94193d9b9d498f69b14a78 (diff) | |
parent | 1c104802f9295afa565e0d62edac5f26b21b9916 (diff) |
am 83f40802: am 95226c98: am 912cacde: Merge "docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API." into lmp-docs automerge: f31eb13
automerge: 1c10480
* commit '1c104802f9295afa565e0d62edac5f26b21b9916':
docs: Adds new geocoding sample to Location API training. Uses GoogleApiClient to connect to Play services. Uses the latest Fused Location Provider API.
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions