commit | b5dfeb3eba56e672948bf664185910145433e271 | [log] [tgz] |
---|---|---|
author | Steven Moreland <smoreland@google.com> | Thu Oct 20 22:09:08 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu Oct 20 22:09:08 2016 +0000 |
tree | 0ccfa853672170773734c9dab414c15b473d5122 | |
parent | 384b0be6dd7433ef6fab995970a91898d658a33a [diff] | |
parent | bde7ce94e523cd6baf401cdddb9cbad744f3b253 [diff] |
Merge "Use defaultPassthroughServiceImplementation for nfc." am: 5bc16ac370 am: 6ba7914286 am: bde7ce94e5 Change-Id: I2a6d3248e5023f28ec35efb78f68b6cff489eeac