tree 62efd7b5443bbb976fbaa8995691a3a421a4527d
parent 1f71a6a273f7602b849e83d82eeb05edccb85fbe
parent 8a95207b86a4397835a8cb4bd43e4fd5a8eeffc5
author Nazanin Bakhshi <nazaninb@google.com> 1552148115 -0800
committer android-build-merger <android-build-merger@google.com> 1552148115 -0800

[automerger skipped] Merge "update getStaticPhoneCapability to use HAL instead of default value" am: 9e6f5d1521 am: 109f4590ca
am: 8a95207b86 -s ours
am skip reason: change_id Ic40921679ade1f9be42f2bc3d5170ba201dbab5a with SHA1 1772247b04 is in history

Change-Id: Ieac24e725bae945aa0023fd72350612d5812c77a