diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-23 12:26:14 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-23 12:26:15 -0700 |
| commit | 2bf953a9ba1949815f5022ae831e81061cb5c7e5 (patch) | |
| tree | f2a238f6f5619fa4fc13473b3a32087df478a940 /rootdir | |
| parent | d5fcafaf41f8ec90986c813f75ec78402096af2d (diff) | |
| parent | 5f83cf0bcf96fc58ca7314571ae264353cdee321 (diff) | |
| download | system_core-2bf953a9ba1949815f5022ae831e81061cb5c7e5.zip system_core-2bf953a9ba1949815f5022ae831e81061cb5c7e5.tar.gz system_core-2bf953a9ba1949815f5022ae831e81061cb5c7e5.tar.bz2 | |
Merge "resolved conflicts for merge of a6405e9d to jb-mr1-dev" into jb-mr1-dev
Diffstat (limited to 'rootdir')
0 files changed, 0 insertions, 0 deletions