diff options
author | Ricardo Cervera <rcervera@google.com> | 2015-01-12 22:26:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-01-12 22:26:58 +0000 |
commit | 5849c0e4c6f8bf44de44e964ce365c0959070494 (patch) | |
tree | 1ff89c39f392cdd7042c5de41b6d4b22ac8501ce /libs/androidfw | |
parent | 00c8565614d3555e723ff3d8dad3af92d69d81ea (diff) | |
parent | cb09d8d08a3628561a58f19713b9358eafa32738 (diff) | |
download | frameworks_base-5849c0e4c6f8bf44de44e964ce365c0959070494.zip frameworks_base-5849c0e4c6f8bf44de44e964ce365c0959070494.tar.gz frameworks_base-5849c0e4c6f8bf44de44e964ce365c0959070494.tar.bz2 |
am 9a19ed17: am eec6dd77: am a87f3555: am d8bd117c: Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs
automerge: cb09d8d
* commit 'cb09d8d08a3628561a58f19713b9358eafa32738':
docs: Add parent calls to WatchFaces snippet.
Diffstat (limited to 'libs/androidfw')
0 files changed, 0 insertions, 0 deletions