| commit | 06b8c2ff33e17fe384ef7d1c9706034d91cafc9d | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Jan 29 11:45:32 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 11:45:32 2015 +0000 |
| tree | 3e31c006b7906447a3e5576f9d15b588b4c5a97d | |
| parent | dc70a465e42c2408a131c6fa496267f20bdf654b [diff] | |
| parent | dff2d8422cee19d35d7eac467ac0fc2315c1c899 [diff] |
am dff2d842: Merge "Fix bad rebase." * commit 'dff2d8422cee19d35d7eac467ac0fc2315c1c899': Fix bad rebase.