summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2015-04-28 00:24:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-28 00:24:19 +0000
commit80d19484c109c4beb0e36b7ce0418ebe526ad300 (patch)
treea9d6b1824931b7aeb421e947bf13cac7ab676655 /tools
parent0af3af0397cb6a92ea140736e84f7484ce029071 (diff)
parent185002bcc9b551828557ab6946fef7fef1c17d74 (diff)
downloadframeworks_base-80d19484c109c4beb0e36b7ce0418ebe526ad300.zip
frameworks_base-80d19484c109c4beb0e36b7ce0418ebe526ad300.tar.gz
frameworks_base-80d19484c109c4beb0e36b7ce0418ebe526ad300.tar.bz2
am 185002bc: Merge "docs: Update Wearable API setup to mention addApiIfAvailable()." into lmp-mr1-ub-docs
* commit '185002bcc9b551828557ab6946fef7fef1c17d74': docs: Update Wearable API setup to mention addApiIfAvailable().
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions