Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am...
authorKalle Raita <kraita@google.com>
Sat, 21 Jan 2017 00:53:02 +0000 (00:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 21 Jan 2017 00:53:02 +0000 (00:53 +0000)
commit89aee89302e49622c43f84b60769eda6695dc2cb
tree90015cc1f592ba2e1461083d9e88ec0731cd2a8f
parent47f02beb9e0f5476bad69dc34e72fe5a9366c98d
parentf390386f2930b114c8830b11592aa5fd24b258a7
Merge changes from topic 'am-afbe65226c664d438460b33cb5a405a8' into nyc-mr1-dev am: 59cabbec64 am: 30d7647d1a
am: f390386f29

Change-Id: I16bdc20c14b0edaa5bbc1457ec55fd3e78dd1515