| commit | 755d35f5fad7821f853f3d315b41cf2e3f1e38fd | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Mon Aug 04 18:37:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 04 18:37:31 2014 +0000 |
| tree | e5125a1a9b1918e96b468bb9420a92f26d5b980d | |
| parent | 6461ddb4e1ea95bd416995c50e2cb93d93d9d390 [diff] | |
| parent | 74b3ecf485254d8cb4ae2b1d4d5221454738a58d [diff] |
am 74b3ecf4: Merge "Disable compilation based on vold.decrypt. [frameworks/native]" * commit '74b3ecf485254d8cb4ae2b1d4d5221454738a58d': Disable compilation based on vold.decrypt. [frameworks/native]