| commit | ac273bbd0b89e0583d37f6bde1f18800d5bb4dfe | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Feb 23 20:51:28 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 23 20:51:28 2017 +0000 |
| tree | dc47fb79c87cebd2a46f611e02d5865252ec33df | |
| parent | 204eed49b5e75c1be2a84d000aae3eeca7776de0 [diff] | |
| parent | df902938ecfdec373cbd7822ba4d118b96101188 [diff] |
Merge "Nfc: deal with the framework going away." am: 26d788b376 am: 74f327f970 am: df902938ec Change-Id: I8fe69cb9e23756029e42facbc7c21b41c2148a4b