tree 7127d33bb5a37a531d232e1a9c15e60ed2223db6
parent 408a6ba50592d0d65c0ad13deb75780c0bb51716
parent b931fca7ebde805e8f070e25f5d8bda774a4614b
author Xavier Ducrohet <xav@google.com> 1403312220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403312220 +0000

am b931fca7: resolved conflicts for merge of f78598f7 to klp-modular-dev-plus-aosp

* commit 'b931fca7ebde805e8f070e25f5d8bda774a4614b':
  Fix repo script to ignore tools. DO NOT MERGE.