tree f5568d9c5615d388e417883be0c1be94293f02ea
parent 82358bd43ed5c827f1157992aa955babf1b4d43a
parent 66afdb1ffe6bb474569aeb59a4d23551da7e1312
author Clay Murphy <claym@google.com> 1394159284 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394159284 +0000

am 66afdb1f: am 8046d816: am 43b42a40: Merge "Docs: Making updates to version information. Bug:11133857 Staging location: http://claym.mtv.corp.google.com:8092/compatibility/cts-intro.html"

* commit '66afdb1ffe6bb474569aeb59a4d23551da7e1312':