diff options
author | Deepanshu Gupta <deepanshu@google.com> | 2015-03-02 19:41:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-02 19:41:59 +0000 |
commit | 7b4caab1a87b659498d30af194ae511526c503ba (patch) | |
tree | 96181fa87e1353b6868fec1328b97d18b7f3ec14 /rs/java/android/renderscript/RenderScript.java | |
parent | 4725bec1ff03d8be859c52dba6ac663016c2295c (diff) | |
parent | 07d453fa091ab407864d474f9bf2a5167686010a (diff) |
am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-dev
* commit '07d453fa091ab407864d474f9bf2a5167686010a':
Add status bar time for 5.1
Diffstat (limited to 'rs/java/android/renderscript/RenderScript.java')
0 files changed, 0 insertions, 0 deletions