tree 8b91dc64790d9781c34d7d2126b1282c8d63dbd8
parent 96b1fb4faaec79c6a84dae60d676b8c5b9ddfe42
parent 0a2d5cf7db8ea23e8297129f1850689dc2d5b503
author Mukesh Agrawal <quiche@google.com> 1487964983 +0000
committer android-build-merger <android-build-merger@google.com> 1487964983 +0000

Merge "StateMachine: add getLogRecMaxSize()" am: 22e43471ed
am: 0a2d5cf7db

Change-Id: Id8a21420d17074e7331f8f67453fe09c338991ec