tree 16aba062ae0eb863070970a263b99bad507d442f
parent c9c9e38d3f85a9ad0fda7c59b342eb461ab23eb8
parent 2b98d8bf680a66ad90b5131d2662a21455f289b6
author Elliott Hughes <enh@google.com> 1365642444 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365642444 -0700

am 2b98d8bf: resolved conflicts for merge of 01ec8332 to jb-mr1-dev-plus-aosp

* commit '2b98d8bf680a66ad90b5131d2662a21455f289b6':
  Fix the SimpleDateFormat L/M E/c documentation.