tree 992fc32fdef605f044c360956ab67d4cc8aa04bc
parent 5f07b6ed60536ddf3fa95772b62aa0d416e2f379
parent a1b6d6325763d05aaf42df7c615f55afc66d9e11
author Pirama Arumuga Nainar <pirama@google.com> 1477504439 +0000
committer android-build-merger <android-build-merger@google.com> 1477504439 +0000

Merge changes from topic 'rs-rebase-275480'
am: a1b6d63257

Change-Id: I8e56bc1bcc358678e78912ed337447edc4a80e94