diff options
| author | 2016-11-21 18:19:53 +0000 | |
|---|---|---|
| committer | 2016-11-21 18:19:53 +0000 | |
| commit | de098d013c8f6fa5bbee8169464b921edde6623d (patch) | |
| tree | cfd75e508bbe2948ede8c1b4b5097ae9bfcba603 /libs/androidfw/AssetManager.cpp | |
| parent | a2193c0b7630cc205c21a30da12791f3047f0bca (diff) | |
| parent | f9154e923b35fe95a3a982555a269a50124ebbcd (diff) | |
Merge "Fix createConfirmDeviceCredentialIntent for wear for CTS." into cw-f-dev
am: f9154e923b
Change-Id: I554442be467ad618d02e5f8f3199d57c45d7b972
Diffstat (limited to 'libs/androidfw/AssetManager.cpp')
0 files changed, 0 insertions, 0 deletions