diff options
| author | Nick Pelly <npelly@google.com> | 2010-09-29 12:20:51 -0700 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2010-09-29 12:20:51 -0700 |
| commit | 4715bd91f5949a1919156a5a5cb50f0cccda645e (patch) | |
| tree | 75e45e380c7208467ac6d29ba79a0ff3806c4f76 /cmds/screencap | |
| parent | 856f2859e8550c274c7fe3f05b971bf34bdcb525 (diff) | |
| parent | f4c3b7e916b417fabb468ec0a565dc79cd7ba2b3 (diff) | |
| download | frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.zip frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.tar.gz frameworks_base-4715bd91f5949a1919156a5a5cb50f0cccda645e.tar.bz2 | |
resolved conflicts for merge of f4c3b7e9 to master
Change-Id: Idcdc521144f3072058b2bb6cb383e42c852e64f4
Diffstat (limited to 'cmds/screencap')
0 files changed, 0 insertions, 0 deletions