tree b97e89bc50a557579f276dcb426807a641965d40
parent d5d88e29d223a013cccf89995eec1f970b081097
parent 01320a387b3ee6e717399fd580fdffd6d6ff7678
author Sen Jiang <senj@google.com> 1490830270 +0000
committer android-build-merger <android-build-merger@google.com> 1490830270 +0000

Merge changes Ice70d9ab,Iba7ac028
am: 01320a387b

Change-Id: Ie9fcffc1626270c19441590fd75f76fbc907ca88