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