summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-12-05 18:03:55 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-05 18:03:55 +0000
commitf254ed9a98bd343feefab3d5737568539b693605 (patch)
treeb0bc4e66cff6e3d72dd6ce6c367058c22b83c6ed /core/java/android
parent6c4557d09c52f545918c9c9a2bfcdfe63e774afd (diff)
parentceddb389b4a1751399a0b1ad3198008011a5397a (diff)
downloadframeworks_base-f254ed9a98bd343feefab3d5737568539b693605.zip
frameworks_base-f254ed9a98bd343feefab3d5737568539b693605.tar.gz
frameworks_base-f254ed9a98bd343feefab3d5737568539b693605.tar.bz2
am ceddb389: am b33fe50a: am dcbde1b0: Merge "libcore_to_document and junit_to_document are no longer functions."
* commit 'ceddb389b4a1751399a0b1ad3198008011a5397a': libcore_to_document and junit_to_document are no longer functions.
Diffstat (limited to 'core/java/android')
0 files changed, 0 insertions, 0 deletions