| commit | 69d82790487c0faeb92815e41fd39cea560c981d | [log] [tgz] |
|---|---|---|
| author | JP Abgrall <jpa@google.com> | Thu Feb 12 17:27:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 12 17:27:04 2015 +0000 |
| tree | e9fca9c9a94b4d41a0e72eb822bf4cf71db1acd4 | |
| parent | 725dcdc39502eee32c92ca03a3cf363691161862 [diff] | |
| parent | 92e0682f05cafa5b67e2a1cfe7c5dd75db037db3 [diff] |
am 92e0682f: resolved conflicts for merge of 7fc55db3 to lmp-mr1-dev-plus-aosp * commit '92e0682f05cafa5b67e2a1cfe7c5dd75db037db3': core: remove dependencies on genext2fs