diff options
| author | Mike Lockwood <lockwood@android.com> | 2011-02-26 13:33:02 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-26 13:33:02 -0800 |
| commit | 82752ef4f857c1911028d075b4313ecd3bebaf27 (patch) | |
| tree | cc9da8d17c584a6d624facd8165dc633803bfaba /rs/java/android/renderscript/ProgramVertexFixedFunction.java | |
| parent | 505312482782a600e997c91712f03f83c7a70428 (diff) | |
| parent | bbd460d76dc69eca9a14ab1127b95a55429f460a (diff) | |
am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a':
DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
Diffstat (limited to 'rs/java/android/renderscript/ProgramVertexFixedFunction.java')
0 files changed, 0 insertions, 0 deletions