summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-03-09 18:03:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-09 18:03:19 +0000
commita05634ffd99dad2225435f5907735c7afdfec10c (patch)
tree646027b6c193c6da3a993d71c426691461314643 /core/java
parent535bf0f8e5034a9a21755df6cf158a4b95e857aa (diff)
parent408800c3aca72d150dacb646d0a455b248fc3db0 (diff)
downloadframeworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.zip
frameworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.tar.gz
frameworks_base-a05634ffd99dad2225435f5907735c7afdfec10c.tar.bz2
am 408800c3: am ea9308cf: am a9639fe6: am 2fcc438f: am 6a96a778: Merge "docs: Add new partners to Wear index page" into lmp-docs
* commit '408800c3aca72d150dacb646d0a455b248fc3db0': docs: Add new partners to Wear index page
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions