commit | 5806aedff0a3203bb22b9fb532e8975b130ed6be | [log] [tgz] |
---|---|---|
author | The Android Open Source Project <initial-contribution@android.com> | Wed Oct 10 09:48:04 2012 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Oct 10 09:48:04 2012 -0700 |
tree | 75007f09318df2f96cc375064168c7df005c154b | |
parent | 1f5205e5d274ba07459b4a2c4bcacd066a3f315b [diff] | |
parent | 4fdf09c3103074770675b40c9fb5e47c04617c61 [diff] |
am 4fdf09c3: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge * commit '4fdf09c3103074770675b40c9fb5e47c04617c61': Fix encryption on certain devices