diff options
| author | Kenny Root <kroot@google.com> | 2012-03-30 20:48:34 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2012-03-30 21:26:01 -0700 |
| commit | 41dda82d847ae8c261b09c383806b412d680f935 (patch) | |
| tree | 98edeec4fa5d9df2d0104624d66b1608cecdaf50 /applypatch | |
| parent | b2364342a05a689bc302bfcd7d5d15f528eb772c (diff) | |
| parent | 0b1fee1b2aa7da86ffdabfe4c577ee8adb93d803 (diff) | |
| download | bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.zip bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.gz bootable_recovery-41dda82d847ae8c261b09c383806b412d680f935.tar.bz2 | |
resolved conflicts for merge of 0b1fee1b to master
Change-Id: I2e8298ff5988a96754f56f80a5186c9605ad9928
Diffstat (limited to 'applypatch')
0 files changed, 0 insertions, 0 deletions