diff options
author | Joe LaPenna <jlapenna@google.com> | 2015-05-14 21:34:16 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 21:34:16 +0000 |
commit | 21de2f629df37014dd269e746924374f3df0811a (patch) | |
tree | f83ee0805274bca1da2eced9f00071505bf07de3 /rs/java/android/renderscript/Int4.java | |
parent | 7fc802bbf750a8ed6be0e1858ebcf9740dda15cb (diff) | |
parent | 08bea4c90dce2991ab518bd167a29df8b23f7d1b (diff) | |
download | frameworks_base-21de2f629df37014dd269e746924374f3df0811a.zip frameworks_base-21de2f629df37014dd269e746924374f3df0811a.tar.gz frameworks_base-21de2f629df37014dd269e746924374f3df0811a.tar.bz2 |
am 08bea4c9: (-s ours) am 627f2681: Merge "Wait for KEY_SLEEP UP event before calling goToSleep()" into lmp-mr1-modular-dev
* commit '08bea4c90dce2991ab518bd167a29df8b23f7d1b':
Wait for KEY_SLEEP UP event before calling goToSleep()
Diffstat (limited to 'rs/java/android/renderscript/Int4.java')
0 files changed, 0 insertions, 0 deletions