am 3ff6488d: am 7738e721: (-s ours) Merge "Version number change for AOSP master"

* commit '3ff6488d0f7275a6f5147b7300daa95384627e1d':
  Version number change for AOSP master