summaryrefslogtreecommitdiffstats
path: root/docs/image_sources/training
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2015-04-23 00:56:24 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-23 00:56:24 +0000
commit03cdfba5aec3d638d926ab8cecb61f9eaa6a03da (patch)
treeeed5432ff24764bcfb29b19c3bbeff4c45764dd8 /docs/image_sources/training
parent64da495dc79bb1b1dc9d5f63b6cc0479391bd757 (diff)
parent453100c06e3e62474e3ad36631deb5fe332bb227 (diff)
downloadframeworks_base-03cdfba5aec3d638d926ab8cecb61f9eaa6a03da.zip
frameworks_base-03cdfba5aec3d638d926ab8cecb61f9eaa6a03da.tar.gz
frameworks_base-03cdfba5aec3d638d926ab8cecb61f9eaa6a03da.tar.bz2
am 453100c0: (-s ours) am 3430f599: am ba43f7e9: Merge "Revert "Sometimes the application context is null""
* commit '453100c06e3e62474e3ad36631deb5fe332bb227': Revert "Sometimes the application context is null"
Diffstat (limited to 'docs/image_sources/training')
0 files changed, 0 insertions, 0 deletions