| commit | db9a6a1cc9256bdd570c774bd80bc0ac56b9a617 | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Thu Jan 29 16:46:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jan 29 16:46:49 2015 +0000 |
| tree | 09c552b619a85a355e5b32c8d6681214f22c82ae | |
| parent | 5eb5e8d867d0b555fc111ec3e08ab13dd58bd6f0 [diff] | |
| parent | 06b8c2ff33e17fe384ef7d1c9706034d91cafc9d [diff] |
am 06b8c2ff: am dff2d842: Merge "Fix bad rebase." * commit '06b8c2ff33e17fe384ef7d1c9706034d91cafc9d': Fix bad rebase.