tree bbd67ac9852be4deb7e0add715fa493334b3e707
parent 6e555e40b0596e452deb6ccbce89d084ad18b658
parent cd30cb3633c2a7409267dd1821e33937e65461ad
author The Android Open Source Project <initial-contribution@android.com> 1415324619 -0800
committer The Android Open Source Project <initial-contribution@android.com> 1415324619 -0800

Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD