diff options
| author | smain@google.com <smain@google.com> | 2014-06-25 20:54:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 20:54:09 +0000 |
| commit | 7ccc10b9697983703ae2dcb1d0ea68e00092ce53 (patch) | |
| tree | 6b81000b0d9d0452cb4147ef1af888593056d195 /rs | |
| parent | 9e6460dd66de91c7f3513f17ffb568dcafd40e4d (diff) | |
| parent | 3edaf370e3ad010784649eb032603f1975b1d136 (diff) | |
| download | frameworks_base-7ccc10b9697983703ae2dcb1d0ea68e00092ce53.zip frameworks_base-7ccc10b9697983703ae2dcb1d0ea68e00092ce53.tar.gz frameworks_base-7ccc10b9697983703ae2dcb1d0ea68e00092ce53.tar.bz2 | |
am 3edaf370: (-s ours) am d9d9d335: am 80c07fb9: am ec6f162f: DO NOT MERGE!
* commit '3edaf370e3ad010784649eb032603f1975b1d136':
DO NOT MERGE!
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions