tree ee8ff735dc6933ad50f53022c59496e17ccc8db7
parent 27cbcd8dd920a29e2ce8dd4d37afaf0ed741cb89
parent 695ad6e6373a0b7aa454011190a8302428e82412
author Ekin Oguz <ekinoguz@google.com> 1485908519 +0000
committer android-build-merger <android-build-merger@google.com> 1485908519 +0000

Explicitly mark chips as "inReplacedChip". am: 11c15260cb am: 0e11ec0835 am: 6168076a2b am: d9d06d8d5f
am: 695ad6e637

Change-Id: I8434e9c647f5e7894698cafac8fc3460044c48f1