tree de520a6c9c8ea7d48eefa5f4e13fdd94053c771e
parent 20c7cf950d5c0446aa073b4c0ed131bbc10a5401
parent 60bf026276fe2516066e2b146a20cea45ca0f695
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1516924879 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1516924879 +0000

Merge changes from topic "am-3606a5e21978498eb7b6d0040eb1a22d"

* changes:
  Merge changes from topic "am-56dd07c8eceb476bbfad59becddc1ba1" into oc-mr1-dev-plus-aosp am: 33fc64360a
  [automerger skipped] Import translations. DO NOT MERGE skipped: 2c3e611a18 skipped: 218841a6dd am: 8eb39fb0f4  -s ours am: a8e2306430  -s ours am: 6ccac2ffc3  -s ours am: 6e0c678836  -s ours