diff options
| author | Doug Zongker <dougz@google.com> | 2014-03-13 08:44:07 -0700 |
|---|---|---|
| committer | Doug Zongker <dougz@google.com> | 2014-03-13 08:44:07 -0700 |
| commit | cfcec9e1d468708269edbd1e8520d1253989aefb (patch) | |
| tree | 10485d489baff7a80488b5daf7381916c1fd8b0e /res/images/icon_installing_overlay03.png | |
| parent | be7eea0a880ed266bb4111dcc3a2159fdb8791d5 (diff) | |
| parent | ea868b3846794cd36424f477503377ea9348137a (diff) | |
| download | bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.gz bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.tar.bz2 bootable_recovery-cfcec9e1d468708269edbd1e8520d1253989aefb.zip | |
Merge commit 'ea868b38' into manualmerge
Conflicts:
screen_ui.cpp
screen_ui.h
Change-Id: Iefe7dde04cc76639f56730a19238436073f18ffb
Diffstat (limited to 'res/images/icon_installing_overlay03.png')
| -rw-r--r-- | res/images/icon_installing_overlay03.png | bin | 9782 -> 0 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/res/images/icon_installing_overlay03.png b/res/images/icon_installing_overlay03.png Binary files differdeleted file mode 100644 index 1a1d738..0000000 --- a/res/images/icon_installing_overlay03.png +++ /dev/null |
