tree 00fec59e697c7115ac8e69cfb2ea6761f0bf3a4b
parent 58770c575979a6b9e2bfeb7fa7cb56c1a17d3d67
parent 90658fab430116adf0f6c86fc97dac97ddbd0d5c
author Wei Wang <weiwa@google.com> 1503017226 +0000
committer android-build-merger <android-build-merger@google.com> 1503017226 +0000

Merge "Add LOCATION_HARDWARE permission to Rtt API." into oc-mr1-dev
am: 90658fab43

Change-Id: I06af71e194a693d2cefc72ed93f7eb8446140ee4