tree cb30cfbafd80e01d314868cdc36e783d39981119
parent 18fe16b1672382bea626d3af13ba9557628985ea
parent 7807da82820912e0d1c711279c19b3097181621d
author Youngsang Cho <youngsang@google.com> 1477958475 +0000
committer android-build-merger <android-build-merger@google.com> 1477958475 +0000

Sync to ub-tv-killing at 6f6e46557accb62c9548e4177d6005aa944dbf33 am: 919e1ed7e9
am: 7807da8282

Change-Id: Ic4f5ba3de6e4cd9d5da8622406736624d920fa5f