| commit | 0d4c31a9952a9cf10750d45f003d1472979a33f5 | [log] [tgz] |
|---|---|---|
| author | Tianjie Xu <xunchang@google.com> | Sat Nov 12 02:11:07 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Sat Nov 12 02:11:07 2016 +0000 |
| tree | e467e0a3ba4bd5dd952e9dbfb15f69365cd538c6 | |
| parent | f6361d872235d2baae8a0eb0bb2cbb53178d755f [diff] | |
| parent | 0b2be22f01ee0ebbf805725f334e8ed2168af5e8 [diff] |
Merge "Allow uncrypt to work without socket communication" am: 4c1f3eda98 am: f2574b8206 am: 91f736fe1a am: 0b2be22f01 -s ours Change-Id: Idc136f347d98f852f6c0bf0cedb7071f7209338c