summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-11-07 18:46:44 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-07 18:46:44 +0000
commit68dcc56aec520b6e38cff0d11dcec1ae92a204ea (patch)
treed47f409d48eaba0e32ba805a2b0f9309197aec42
parent563a438363acf3b56d3d55d3f54a4eb11604a3c9 (diff)
parent10a08abd8f9249f66f73070955c2f3f09d45598b (diff)
downloadframeworks_base-68dcc56aec520b6e38cff0d11dcec1ae92a204ea.zip
frameworks_base-68dcc56aec520b6e38cff0d11dcec1ae92a204ea.tar.gz
frameworks_base-68dcc56aec520b6e38cff0d11dcec1ae92a204ea.tar.bz2
am 10a08abd: am 578e205d: am e7cd5f2e: Merge "docs: Add API_UNAVAILABLE case for Wear. Bug: 17753200" into klp-modular-docs automerge: 58dc8c4 automerge: c9ad13a
* commit '10a08abd8f9249f66f73070955c2f3f09d45598b':
0 files changed, 0 insertions, 0 deletions