diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2013-03-11 12:41:56 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2013-03-11 12:41:56 -0700 |
commit | 2f50df0058dff23fbdfc6b123bb92aaa90aea09b (patch) | |
tree | f409e9713f1a67839b170f76e42c273667b91449 /minui/minui.h | |
parent | ec838b885dd8b74b8682dd2498c7da8f7afca291 (diff) | |
parent | c09444eb5b66a5702db99d9b7de23cb73bf11aa4 (diff) | |
download | bootable_recovery-2f50df0058dff23fbdfc6b123bb92aaa90aea09b.zip bootable_recovery-2f50df0058dff23fbdfc6b123bb92aaa90aea09b.tar.gz bootable_recovery-2f50df0058dff23fbdfc6b123bb92aaa90aea09b.tar.bz2 |
am c09444eb: am f91bd41c: am 1c302caf: (-s ours) am c14a7fbd: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit 'c09444eb5b66a5702db99d9b7de23cb73bf11aa4':
Diffstat (limited to 'minui/minui.h')
0 files changed, 0 insertions, 0 deletions