| commit | df902938ecfdec373cbd7822ba4d118b96101188 | [log] [tgz] |
|---|---|---|
| author | Martijn Coenen <maco@google.com> | Thu Feb 23 19:41:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Feb 23 19:41:18 2017 +0000 |
| tree | 1b2ce0167663ccbe0bcb1edd9e97dee39a70a832 | |
| parent | 57a84aa03678a7dd93aa4a132c16be2efd94a104 [diff] | |
| parent | 74f327f9701a257d94caa9eeeb35b78c78525ba1 [diff] |
Merge "Nfc: deal with the framework going away." am: 26d788b376 am: 74f327f970 Change-Id: I4a79addd60fd26ce79a016853a5661ebeca31722