diff options
| author | Jason Monk <jmonk@google.com> | 2015-02-26 23:18:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-26 23:18:53 +0000 |
| commit | 0ac63669b1a3da456fde5c8df61b652eb090a407 (patch) | |
| tree | 40fa7eeef93d5ce158ed29b9365d1223a6c758fd /rs/java/android/renderscript/RenderScript.java | |
| parent | b8b1e07668f684b734758fe2084496466d671339 (diff) | |
| parent | 057fd382cc26ff85db397835fdd3b7e5c73ef336 (diff) | |
am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev
* commit '057fd382cc26ff85db397835fdd3b7e5c73ef336':
Keyguard: Use plmn/spn broadcast when no SIMs
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions