summaryrefslogtreecommitdiffstats
path: root/samples/training
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-10-02 21:50:09 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-02 21:50:09 +0000
commit7def60268519536083839a7fd0a2ddfd68d75504 (patch)
treec71725c9a7d4d43fbfa5872ac4d48332ec88adf6 /samples/training
parent9cdde5f8348ddd03e1d6eb2c741fb3e761ab66e9 (diff)
parent285859b13728c5cfb6124c11212978f8f95cd9de (diff)
downloadframeworks_base-7def60268519536083839a7fd0a2ddfd68d75504.zip
frameworks_base-7def60268519536083839a7fd0a2ddfd68d75504.tar.gz
frameworks_base-7def60268519536083839a7fd0a2ddfd68d75504.tar.bz2
am 285859b1: am d36dbe09: am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs
* commit '285859b13728c5cfb6124c11212978f8f95cd9de': Revert "docs: Update for Android 23.0.4"
Diffstat (limited to 'samples/training')
0 files changed, 0 insertions, 0 deletions