tree 27352320019ef6544dd52244e67464f93fd149ca
parent 3a32798c0319e96a83a40eae58a8c916818d051e
parent 4f8ee97e89a08f25e55f04873a1abd129e0d47f2
author The Android Open Source Project <initial-contribution@android.com> 1444166016 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1444166016 +0000

am 4f8ee97e: Merge remote-tracking branch \'goog/stage-aosp-master\' into HEAD

* commit '4f8ee97e89a08f25e55f04873a1abd129e0d47f2':