refs/heads/pie-dev - platform/packages/apps/Nfc

commit: a2ea959366a264fffb4ee8254015d90161e93cd2
[log]
author: Ruchi Kandoi <kandoiruchi@google.com>
Fri Jun 01 01:13:33 2018 +0000
committer: Android (Google) Code Review <android-gerrit@google.com>
Fri Jun 01 01:13:33 2018 +0000
tree: 27d81848158768a2dc5de82fba4faf7cd8cf5fcd
parent: 8d6ec2f1bafd88308e8afb9b24374104183ba000 [diff]
parent: cefb76a27ed29ef2b0900a5abe8e2196dfa5f385 [diff]

Merge changes from topic "b/78568653" into pi-dev

* changes:
  Adds logic for OFFHOST_AID_ROUTE_PWR_STATE
  Fix to issue with routing table update for offhost AID.

tree: 27d81848158768a2dc5de82fba4faf7cd8cf5fcd

assets/
etc/
nci/
res/
src/
tests/
.clang-format
Android.mk
AndroidManifest.xml
CleanSpec.mk
OWNERS
PREUPLOAD.cfg