| commit | b49b2c4bfcd0bfc773e08ac6278270a36f52c93e | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Thu Jul 06 22:52:28 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 06 22:52:28 2017 +0000 |
| tree | 9a3fdeb79102bc58ee00526e6d4e6257a99cfeaa | |
| parent | 5a0b6640da5dc7b13cb981c3663171543611a3e4 [diff] | |
| parent | 1ee140a16d059fbe0859e3fca1582c17fe1fe534 [diff] |
Merge changes from topic 'am-638c543cf14f446eae62e5f283001253' into stage-aosp-master * changes: Merge changes from topic 'NCI-2.0' am: 85be705e84 NCI2.0 Added extended power state for routing. am: 5e4b4d7eb1 NCI2.0 T2T Tag read improvement. am: 67a3e862e5 NCI2.0 subset AID matching support added. am: f3c018a8a0 NCI2.0 AID Block Route feature am: c6bd78b8ab NCI2.0 Ordering of Routing Table am: b4ac88d0f7