tree cee99ab2df71ba5b1723a1315d40fd22bcd11ab5
parent 05e92e7bd493646e0d07a8823132a97e449fe45c
author Omar El Ayach <oelayach@google.com> 1527644341 -0700
committer Omar El Ayach <oelayach@google.com> 1527644548 +0000

Merge "Retail AP feature and robustness enhancements"
am: 66bc7bb0fb

Test: Done
Bug: 65563975

Change-Id: I71f166d8116476c1b2cddf82bb41f570db1df06d
(cherry picked from commit 69bec35830be1074a899d697709f65500b73357e)