summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJoe Malin <jmalin@google.com>2013-10-09 16:29:26 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-09 16:29:26 -0700
commit8cca8b058c4bf425f88be8d354bc47860a76626f (patch)
tree86b53c37db35dcc0eb8004a3c7f23c5fc24b0fdf /core/java/android
parente7315e4ea1608aecd2d7df86618439368569541e (diff)
parent104b91056ef4d6f10410d235d76197f4fe43829b (diff)
downloadframeworks_base-8cca8b058c4bf425f88be8d354bc47860a76626f.zip
frameworks_base-8cca8b058c4bf425f88be8d354bc47860a76626f.tar.gz
frameworks_base-8cca8b058c4bf425f88be8d354bc47860a76626f.tar.bz2
am 104b9105: am 9b6ce699: am ead8478a: am 299d57f7: am a3da7e4e: am 48872ee0: Merge "DOC CHANGE: Android Beam training class" into jb-mr2-docs
* commit '104b91056ef4d6f10410d235d76197f4fe43829b': DOC CHANGE: Android Beam training class
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions