tree f602921d2c790d7a73fb705369a0e414524b1416
parent f4721bb9afc5431d630e39f07b1759a585e89bbd
parent 0b6f38ec143fe5983fe985856a3ac4a30d4683ae
author Dmitry Shmidt <dimitrysh@google.com> 1472501595 +0000
committer android-build-merger <android-build-merger@google.com> 1472501595 +0000

Cumulative patch from commit 3b208346ec56342fda736e62601df485ed002493 am: d5ab1b53af
am: 0b6f38ec14

Change-Id: I23be70a0c496803b841cb257efec74180120196d