diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-05-17 13:50:32 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-05-17 13:50:32 -0700 |
| commit | 9eb7a72253295d5e52151f4e8cdeddd6253e3998 (patch) | |
| tree | 918fcce6ef684d3f78fe70a5a3cefe8176ed3222 /tests | |
| parent | eb8f850d0b7e53956e917fd9645f808c1a09bc88 (diff) | |
| parent | f7fb5331e5635ee5b16ba77170229eb7e59ca5ea (diff) | |
| download | frameworks_base-9eb7a72253295d5e52151f4e8cdeddd6253e3998.zip frameworks_base-9eb7a72253295d5e52151f4e8cdeddd6253e3998.tar.gz frameworks_base-9eb7a72253295d5e52151f4e8cdeddd6253e3998.tar.bz2 | |
resolved conflicts for merge of f7fb5331 to kraken
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions