summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDeepanshu Gupta <deepanshu@google.com>2014-05-13 17:55:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 17:55:41 +0000
commit872a5a1a93eef53a18d18778104bb8669b4bc073 (patch)
tree55c0e9f3d64997cdafc20e130ce03f13b03727ab /docs
parent7ce3b5ef64b1a183b75279016e6fc4f65be8c933 (diff)
parent01fefec9397569cf9c7c5b599c16126f1b4d6870 (diff)
downloadframeworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.zip
frameworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.tar.gz
frameworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.tar.bz2
am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit '01fefec9397569cf9c7c5b599c16126f1b4d6870': Fix CalendarView to show the right labels. [DO NOT MERGE]
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions