tree 4be39da124433a681b4f1deb01c3d69622e5ebed
parent 28fa1348799f7aa4decb81c07aefc05600a52f44
parent e8931637f9966ec84eb045bc67d15c7269e56f77
author Xavier Ducrohet <xav@google.com> 1400252210 +0000
committer android-build-merger <android-build-merger@google.com> 1400252210 +0000

Merge "Fix project setup." into idea133
 Auto-merge: e893163

* commit 'e8931637f9966ec84eb045bc67d15c7269e56f77':
  Fix project setup.