diff options
| author | Elliott Hughes <enh@google.com> | 2015-02-10 16:20:53 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-02-10 16:20:53 -0800 |
| commit | dcbf4fc571236bf5aa5286294b3c727be725db70 (patch) | |
| tree | 05f42afb7d801d2ff3c6b7a3ac0e05949f710b69 /minui | |
| parent | ec5c1c1e291062576925b80b532d36df118103f5 (diff) | |
| parent | 35efcd275f90f5ffea371bb228a14b36c50e61d3 (diff) | |
| download | bootable_recovery-dcbf4fc571236bf5aa5286294b3c727be725db70.zip bootable_recovery-dcbf4fc571236bf5aa5286294b3c727be725db70.tar.gz bootable_recovery-dcbf4fc571236bf5aa5286294b3c727be725db70.tar.bz2 | |
resolved conflicts for merge of 35efcd27 to lmp-mr1-dev-plus-aosp
Change-Id: I6f2ea07df2ab80a44301d9c3a2a8841c40a46002
Diffstat (limited to 'minui')
0 files changed, 0 insertions, 0 deletions