| commit | df19c901f9003d2ffb173aec0e71d74773579ef2 | [log] [tgz] |
|---|---|---|
| author | Christopher Wiley <wiley@google.com> | Thu Apr 14 20:35:13 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Apr 14 20:35:13 2016 +0000 |
| tree | dffca5c0bfa58087211c4d8a85c5daf2e4472795 | |
| parent | ee3de990d9e193eaa5aa4c54d45dec8e93867ef1 [diff] | |
| parent | ff2e5051ae2cda043f9de2deb0bde5bd2ab28da6 [diff] |
resolve merge conflicts of faac064 to nyc-dev-plus-aosp am: ff2e505 * commit 'ff2e5051ae2cda043f9de2deb0bde5bd2ab28da6': Export libbinder headers from libkeystore_binder Change-Id: I54d1f55873a72171f4b61a2d3e74087368055870