tree 8f05f46c408a78ce5a1d7794fb3765c5fee52dc1
parent ec7fe2918ddeef4bcd6fcf4cb403908a3446e48e
parent fe0e6fa220bcbdb374acdfc5e89b029b760317c7
author Xavier Ducrohet <xav@google.com> 1403136892 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403136892 +0000

am fe0e6fa2: am e57dec72: Merge "Fix ddmuilib Eclipse project." into idea133 automerge: b0d4048

* commit 'fe0e6fa220bcbdb374acdfc5e89b029b760317c7':
  Fix ddmuilib Eclipse project.