tree 1f4a33c24f608d79781de54e5d1ff5f3072fa261
parent 758ff21d7d593394626171e14869f448967ea966
parent 27ddc3e299baca7d8987fc92933683d7d3268ec6
author Ed Heyl <edheyl@google.com> 1418067743 -0800
committer Ed Heyl <edheyl@google.com> 1418068671 -0800

resolved conflicts for merge of 27ddc3e2 to master
fixes in build.gradle

Change-Id: I8022d0152b67fe2f3e83417955c95dca97e1b5a6