tree 96065537ae52025d8bdf72941c0ae7440d804651
parent 22d0367e7211b688f3174e27022e89a7ffe615d6
parent ba7136dddfadc95802ad4464563a252556e999cb
author Pirama Arumuga Nainar <pirama@google.com> 1477505615 +0000
committer android-build-merger <android-build-merger@google.com> 1477505615 +0000

Merge changes from topic 'rs-rebase-275480' am: b167d69629 am: 4731f75a07
am: ba7136dddf

Change-Id: Ie8412a6af1298f02136eee6b585b5ff30acf885c