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